X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcBinds.lhs;h=f27637d0dd723025d132fa8f5bc464b6f682b9e4;hb=85e16365444e938b4adff9d241d56df4c1fbca91;hp=a18c9ac3c9e05c4cae91ae22a95e27aa7c2d4b41;hpb=ad94d40948668032189ad22a0ad741ac1f645f50;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcBinds.lhs b/compiler/typecheck/TcBinds.lhs
index a18c9ac..f27637d 100644
--- a/compiler/typecheck/TcBinds.lhs
+++ b/compiler/typecheck/TcBinds.lhs
@@ -9,7 +9,7 @@
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module TcBinds ( tcLocalBinds, tcTopBinds, 
@@ -42,7 +42,7 @@ import VarEnv
 import TysPrim
 import Id
 import IdInfo
-import Var ( TyVar )
+import Var ( TyVar, varType )
 import Name
 import NameSet
 import NameEnv
@@ -344,15 +344,15 @@ tcPolyBinds top_lvl sig_fn prag_fn rec_group rec_tc binds
 	   generalise dflags top_lvl bind_list sig_fn mono_bind_infos lie_req
 
 	-- BUILD THE POLYMORPHIC RESULT IDs
-  ; let dict_ids = map instToId dicts
-  ; exports <- mapM (mkExport top_lvl prag_fn tyvars_to_gen (map idType dict_ids))
+  ; let dict_vars = map instToVar dicts	-- May include equality constraints
+  ; exports <- mapM (mkExport top_lvl prag_fn tyvars_to_gen (map varType dict_vars))
 		    mono_bind_infos
 
   ; let	poly_ids = [poly_id | (_, poly_id, _, _) <- exports]
   ; traceTc (text "binding:" <+> ppr (poly_ids `zip` map idType poly_ids))
 
   ; let abs_bind = L loc $ AbsBinds tyvars_to_gen
-	 		            dict_ids exports
+	 		            dict_vars exports
 	 		    	    (dict_binds `unionBags` binds')
 
   ; return ([unitBag abs_bind], poly_ids)	-- poly_ids are guaranteed zonked by mkExport
@@ -378,17 +378,18 @@ mkExport top_lvl prag_fn inferred_tvs dict_tys (poly_name, mb_sig, mono_id)
   = do	{ warn_missing_sigs <- doptM Opt_WarnMissingSigs
 	; let warn = isTopLevel top_lvl && warn_missing_sigs
 	; (tvs, poly_id) <- mk_poly_id warn mb_sig
+		-- poly_id has a zonked type
 
-	; poly_id' <- zonkId poly_id
-	; prags <- tcPrags poly_id' (prag_fn poly_name)
+	; prags <- tcPrags poly_id (prag_fn poly_name)
 		-- tcPrags requires a zonked poly_id
 
-	; return (tvs, poly_id', mono_id, prags) }
+	; return (tvs, poly_id, mono_id, prags) }
   where
     poly_ty = mkForAllTys inferred_tvs (mkFunTys dict_tys (idType mono_id))
 
-    mk_poly_id warn Nothing    = do { missingSigWarn warn poly_name poly_ty
-				    ; return (inferred_tvs, mkLocalId poly_name poly_ty) }
+    mk_poly_id warn Nothing    = do { poly_ty' <- zonkTcType poly_ty
+				    ; missingSigWarn warn poly_name poly_ty'
+				    ; return (inferred_tvs, mkLocalId poly_name poly_ty') }
     mk_poly_id warn (Just sig) = do { tvs <- mapM zonk_tv (sig_tvs sig)
 			            ; return (tvs,  sig_id sig) }