remove some leftovers of the first ghci debugger prototype

[ghc-hetmet.git] / compiler / typecheck / TcRnDriver.lhs

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 8bb8d3e..e5f945c 100644 (file)
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -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,
@@ -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") ;