X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=8638d9f5ec2bd5db3c36458a313d00e147eb7ca0;hb=4029d85741ffa537084e97ba276605b6a443c304;hp=acaf05caaa31aa297697f85aaee829f176a40ff9;hpb=f1cc3eb980a634e62f2739a7a25387c902fa9d8a;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index acaf05c..8638d9f 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -59,7 +59,7 @@ import Id
 import VarEnv
 import Var
 import Module
-import LazyUniqFM
+import UniqFM
 import Name
 import NameEnv
 import NameSet
@@ -297,7 +297,7 @@ tcRnExtCore hsc_env (HsExtCore this_mod decls src_binds)
 	-- any mutually recursive types are done right
 	-- Just discard the auxiliary bindings; they are generated 
 	-- only for Haskell source code, and should already be in Core
-   (tcg_env, _aux_binds) <- tcTyAndClassDecls emptyModDetails rn_decls ;
+   (tcg_env, _aux_binds, _dm_ids) <- tcTyAndClassDecls emptyModDetails rn_decls ;
 
    setGblEnv tcg_env $ do {
 	-- Make the new type env available to stuff slurped from interface files
@@ -433,7 +433,7 @@ tc_rn_src_decls boot_details ds
 	failWithTc (text "Can't do a top-level splice; need a bootstrapped compiler")
 #else
 	-- If there's a splice, we must carry on
-	   Just (SpliceDecl splice_expr, rest_ds) -> do {
+	   Just (SpliceDecl splice_expr _, rest_ds) -> do {
 
 	-- Rename the splice expression, and get its supporting decls
 	(rn_splice_expr, splice_fvs) <- checkNoErrs (rnLExpr splice_expr) ;
@@ -477,16 +477,18 @@ tcRnHsBootDecls decls
 
 		-- Check for illegal declarations
 	; case group_tail of
-	     Just (SpliceDecl d, _) -> badBootDecl "splice" d
-	     Nothing                -> return ()
+	     Just (SpliceDecl d _, _) -> badBootDecl "splice" d
+	     Nothing                  -> return ()
 	; mapM_ (badBootDecl "foreign") for_decls
 	; mapM_ (badBootDecl "default") def_decls
 	; mapM_ (badBootDecl "rule")    rule_decls
 
 		-- Typecheck type/class decls
 	; traceTc (text "Tc2")
-	; (tcg_env, aux_binds) <- tcTyAndClassDecls emptyModDetails tycl_decls
-	; setGblEnv tcg_env	$ do {
+	; (tcg_env, aux_binds, dm_ids) 
+               <- tcTyAndClassDecls emptyModDetails tycl_decls
+	; setGblEnv tcg_env    $ 
+          tcExtendIdEnv dm_ids $ do {
 
 		-- Typecheck instance decls
 		-- Family instance declarations are rejected here
@@ -566,15 +568,19 @@ checkHiBootIface
 
 		-- Check instance declarations
 	; mb_dfun_prs <- mapM check_inst boot_insts
-	; let tcg_env' = tcg_env { tcg_binds    = binds `unionBags` dfun_binds,
-				   tcg_type_env = extendTypeEnvWithIds local_type_env boot_dfuns }
-	      dfun_prs   = catMaybes mb_dfun_prs
-	      boot_dfuns = map fst dfun_prs
-	      dfun_binds = listToBag [ mkVarBind boot_dfun (nlHsVar dfun)
-				     | (boot_dfun, dfun) <- dfun_prs ]
+        ; let dfun_prs   = catMaybes mb_dfun_prs
+              boot_dfuns = map fst dfun_prs
+              dfun_binds = listToBag [ mkVarBind boot_dfun (nlHsVar dfun)
+                                     | (boot_dfun, dfun) <- dfun_prs ]
+              type_env'  = extendTypeEnvWithIds local_type_env boot_dfuns
+              tcg_env'   = tcg_env { tcg_binds = binds `unionBags` dfun_binds }
 
         ; failIfErrsM
-	; return tcg_env' }
+	; setGlobalTypeEnv tcg_env' type_env' }
+	     -- Update the global type env *including* the knot-tied one
+             -- so that if the source module reads in an interface unfolding
+             -- mentioning one of the dfuns from the boot module, then it
+             -- can "see" that boot dfun.   See Trac #4003
   where
     check_export boot_avail	-- boot_avail is exported by the boot iface
       | name `elem` dfun_names = return ()	
@@ -817,10 +823,12 @@ tcTopSrcDecls boot_details
 		-- The latter come in via tycl_decls
         traceTc (text "Tc2") ;
 
-	(tcg_env, aux_binds) <- tcTyAndClassDecls boot_details tycl_decls ;
+	(tcg_env, aux_binds, dm_ids) <- tcTyAndClassDecls boot_details tycl_decls ;
 		-- If there are any errors, tcTyAndClassDecls fails here
 	
-	setGblEnv tcg_env	$ do {
+	setGblEnv tcg_env	$
+        tcExtendIdEnv dm_ids    $ do {
+
 		-- Source-language instances, including derivings,
 		-- and import the supporting declarations
         traceTc (text "Tc3") ;
@@ -850,13 +858,12 @@ tcTopSrcDecls boot_details
 	(tc_val_binds, tcl_env) <- setLclTypeEnv tcl_env $
 			 	   tcTopBinds val_binds;
 
+        setLclTypeEnv tcl_env $ do {	-- Environment doesn't change now
+
 	     	-- Second pass over class and instance declarations, 
         traceTc (text "Tc6") ;
-	(inst_binds, tcl_env) <- setLclTypeEnv tcl_env $ 
-                                 tcInstDecls2 tycl_decls inst_infos ;
-                                 	showLIE (text "after instDecls2") ;
-
-        setLclTypeEnv tcl_env $ do {	-- Environment doesn't change now
+	inst_binds <- tcInstDecls2 tycl_decls inst_infos ;
+        showLIE (text "after instDecls2") ;
 
 		-- Foreign exports
         traceTc (text "Tc7") ;
@@ -1337,7 +1344,7 @@ getModuleExports :: HscEnv -> Module -> IO (Messages, Maybe [AvailInfo])
 getModuleExports hsc_env mod
   = let
       ic        = hsc_IC hsc_env
-      checkMods = ic_toplev_scope ic ++ ic_exports ic
+      checkMods = ic_toplev_scope ic ++ map fst (ic_exports ic)
     in
     initTc hsc_env HsSrcFile False iNTERACTIVE (tcGetModuleExports mod checkMods)