X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;fp=ghc%2Fcompiler%2Ftypecheck%2FTcInstDcls.lhs;h=88dcd8e64c2a305e7c8b4e5b00de68cebec5bb2a;hb=e31827c6f8e3dc8aee72500cd224c7bdb4f6a764;hp=04fbafb5b199dbe25cdc7f8d321bfcb38723e390;hpb=edf6bdfb5dee21f9bc5077083e5350ee64efffbc;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs
index 04fbafb..88dcd8e 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/ghc/compiler/typecheck/TcInstDcls.lhs
@@ -179,10 +179,6 @@ tcLocalInstDecl1 :: LInstDecl Name
 	-- Type-check all the stuff before the "where"
 	--
 	-- We check for respectable instance type, and context
-	-- but only do this for non-imported instance decls.
-	-- Imported ones should have been checked already, and may indeed
-	-- contain something illegal in normal Haskell, notably
-	--	instance CCallable [Char] 
 tcLocalInstDecl1 decl@(L loc (InstDecl poly_ty binds uprags))
   =	-- Prime error recovery, set source location
     recoverM (returnM Nothing)		$
@@ -395,18 +391,6 @@ tcInstDecl2 (InstInfo { iSpec = ispec, iBinds = binds })
 		--	See Note [Inline dfuns] below
 
 	dict_rhs
-	  | null scs_and_meths
-	  = 	-- Blatant special case for CCallable, CReturnable
-		-- If the dictionary is empty then we should never
-		-- select anything from it, so we make its RHS just
-		-- emit an error message.  This in turn means that we don't
-		-- mention the constructor, which doesn't exist for CCallable, CReturnable
-		-- Hardly beautiful, but only three extra lines.
-	    nlHsApp (noLoc $ TyApp (nlHsVar rUNTIME_ERROR_ID) 
-				   [idType this_dict_id])
-		  (nlHsLit (HsStringPrim (mkFastString msg)))
-
-	  | otherwise	-- The common case
 	  = mkHsConApp dict_constr inst_tys' (map HsVar scs_and_meths)
 		-- We don't produce a binding for the dict_constr; instead we
 		-- rely on the simplifier to unfold this saturated application