X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=8468f8753723667761adfac5b624223047fa438b;hp=8bb8d3e903f843ad6fce66e4338ee1895da5d453;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hpb=800dba35d6ad4dde3d54a293687307f160a05dea

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 8bb8d3e..8468f87 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -12,7 +12,6 @@ module TcRnDriver (
 	tcRnLookupName,
 	tcRnGetInfo,
 	getModuleExports, 
-        tcRnRecoverDataCon,
 #endif
 	tcRnModule, 
 	tcTopSrcDecls,
@@ -198,7 +197,7 @@ tcRnModule hsc_env hsc_src save_rn_syntax
 \begin{code}
 tcRnImports :: HscEnv -> Module -> [LImportDecl RdrName] -> TcM TcGblEnv
 tcRnImports hsc_env this_mod import_decls
-  = do	{ (rn_imports, rdr_env, imports) <- rnImports import_decls ;
+  = do	{ (rn_imports, rdr_env, imports,hpc_info) <- rnImports import_decls ;
 
 	; let { dep_mods :: ModuleNameEnv (ModuleName, IsBootInterface)
 	      ; dep_mods = imp_dep_mods imports
@@ -227,7 +226,8 @@ tcRnImports hsc_env this_mod import_decls
               tcg_rn_imports   = fmap (const rn_imports) (tcg_rn_imports gbl),
 	      tcg_inst_env     = extendInstEnvList (tcg_inst_env gbl) home_insts,
 	      tcg_fam_inst_env = extendFamInstEnvList (tcg_fam_inst_env gbl) 
-                                                      home_fam_insts
+                                                      home_fam_insts,
+	      tcg_hpc          = hpc_info
 	    }) $ do {
 
 	; traceRn (text "rn1" <+> ppr (imp_dep_mods imports))
@@ -314,6 +314,7 @@ tcRnExtCore hsc_env (HsExtCore this_mod decls src_binds)
 				mg_types     = final_type_env,
 				mg_insts     = tcg_insts tcg_env,
 				mg_fam_insts = tcg_fam_insts tcg_env,
+				mg_inst_env  = tcg_inst_env tcg_env,
 				mg_fam_inst_env = tcg_fam_inst_env tcg_env,
 				mg_rules     = [],
 				mg_binds     = core_binds,
@@ -323,7 +324,7 @@ tcRnExtCore hsc_env (HsExtCore this_mod decls src_binds)
 				mg_fix_env   = emptyFixityEnv,
 				mg_deprecs   = NoDeprecs,
 				mg_foreign   = NoStubs,
-				mg_hpc_info  = noHpcInfo,
+				mg_hpc_info  = emptyHpcInfo False,
                                 mg_modBreaks = emptyModBreaks,
                                 mg_vect_info = noVectInfo
 		    } } ;
@@ -695,10 +696,10 @@ tcTopSrcDecls boot_details
 	(tc_val_binds,   tcl_env) <- tcTopBinds val_binds ;
 	setLclTypeEnv tcl_env 	$ do {
 
-		-- Now GHC-generated derived bindings and generics
-		-- Do not generate warnings from compiler-generated code
-	(tc_deriv_binds, tcl_env) <- discardWarnings $ setOptM Opt_GlasgowExts $ 
-				     tcTopBinds deriv_binds ;
+		-- Now GHC-generated derived bindings and generics.
+		-- Do not generate warnings from compiler-generated code.
+	(tc_deriv_binds, tcl_env) <- discardWarnings $
+                                 tcTopBinds deriv_binds ;
 
 	     	-- Second pass over class and instance declarations, 
         traceTc (text "Tc6") ;
@@ -1204,13 +1205,6 @@ lookup_rdr_name rdr_name = do {
     return good_names
  }
 
-tcRnRecoverDataCon :: HscEnv -> Ptr () -> IO (Maybe DataCon) 
-tcRnRecoverDataCon hsc_env ptr
-  = initTcPrintErrors hsc_env iNTERACTIVE $ 
-    setInteractiveContext hsc_env (hsc_IC hsc_env) $ do
-        name <- dataConInfoPtrToName ptr
-        tcLookupDataCon name
-
 tcRnLookupName :: HscEnv -> Name -> IO (Maybe TyThing)
 tcRnLookupName hsc_env name
   = initTcPrintErrors hsc_env iNTERACTIVE $