X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FTidyPgm.lhs;h=f1564784eef860d513e4cc71ae183be51ffb5f38;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hp=b95d4d31abcd864179bccfec27e3e640d5994aed;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/main/TidyPgm.lhs b/compiler/main/TidyPgm.lhs
index b95d4d3..f156478 100644
--- a/compiler/main/TidyPgm.lhs
+++ b/compiler/main/TidyPgm.lhs
@@ -21,16 +21,14 @@ import VarSet
 import Var		( Id, Var )
 import Id		( idType, idInfo, idName, idCoreRules, isGlobalId,
 			  isExportedId, mkVanillaGlobal, isLocalId, isNaughtyRecordSelector,
-			  idArity, idCafInfo, idUnfolding, isImplicitId, setIdInfo
+			  idArity, idCafInfo, idUnfolding, isImplicitId, setIdInfo,
+			  isTickBoxOp
 			) 
 import IdInfo		{- loads of stuff -}
 import InstEnv		( Instance, DFunId, instanceDFunId, setInstanceDFunId )
 import NewDemand	( isBottomingSig, topSig )
 import BasicTypes	( Arity, isNeverActive, isNonRuleLoopBreaker )
-import Name		( Name, getOccName, nameOccName, mkInternalName,
-		  	  localiseName, isExternalName, nameSrcLoc,
-			  isWiredInName, getName
-			)
+import Name
 import NameSet		( NameSet, elemNameSet )
 import IfaceEnv		( allocateGlobalBinder )
 import NameEnv		( filterNameEnv, mapNameEnv )
@@ -123,7 +121,9 @@ mkBootModDetails hsc_env (ModGuts { mg_module    = mod
 				  , mg_exports   = exports
 				  , mg_types     = type_env
 				  , mg_insts     = insts
-				  , mg_fam_insts = fam_insts })
+				  , mg_fam_insts = fam_insts
+                                  , mg_modBreaks = modBreaks   
+                                  })
   = do	{ let dflags = hsc_dflags hsc_env 
 	; showPass dflags "Tidy [hoot] type env"
 
@@ -137,7 +137,10 @@ mkBootModDetails hsc_env (ModGuts { mg_module    = mod
 			     , md_insts     = insts'
 			     , md_fam_insts = fam_insts
 			     , md_rules     = []
-			     , md_exports   = exports })
+			     , md_exports   = exports
+                             , md_modBreaks = modBreaks 
+                             , md_vect_info = noVectInfo
+                             })
 	}
   where
 
@@ -238,8 +241,11 @@ tidyProgram hsc_env
 				mg_insts = insts, mg_fam_insts = fam_insts,
 				mg_binds = binds, 
 				mg_rules = imp_rules,
+                                mg_vect_info = vect_info,
 				mg_dir_imps = dir_imps, mg_deps = deps, 
-				mg_foreign = foreign_stubs })
+				mg_foreign = foreign_stubs,
+			        mg_hpc_info = hpc_info,
+                                mg_modBreaks = modBreaks })
 
   = do	{ let dflags = hsc_dflags hsc_env
 	; showPass dflags "Tidy Core"
@@ -290,13 +296,17 @@ tidyProgram hsc_env
 			   cg_binds    = all_tidy_binds,
 			   cg_dir_imps = dir_imps,
 			   cg_foreign  = foreign_stubs,
-			   cg_dep_pkgs = dep_pkgs deps }, 
+			   cg_dep_pkgs = dep_pkgs deps,
+			   cg_hpc_info = hpc_info }, 
 
 		   ModDetails { md_types     = tidy_type_env,
 				md_rules     = tidy_rules,
 				md_insts     = tidy_insts,
 				md_fam_insts = fam_insts,
-				md_exports   = exports })
+				md_exports   = exports,
+                                md_modBreaks = modBreaks,
+                                md_vect_info = vect_info    -- is already tidy
+                              })
 	}
 
 lookup_dfun type_env dfun_id
@@ -661,7 +671,7 @@ tidyTopName mod nc_var ext_ids occ_env id
     global	= isExternalName name
     local	= not global
     internal	= not external
-    loc		= nameSrcLoc name
+    loc		= nameSrcSpan name
 
     (occ_env', occ') = tidyOccName occ_env (nameOccName name)
 
@@ -789,11 +799,13 @@ CAF list to keep track of non-collectable CAFs.
 \begin{code}
 hasCafRefs  :: PackageId -> VarEnv Var -> Arity -> CoreExpr -> CafInfo
 hasCafRefs this_pkg p arity expr 
-  | is_caf || mentions_cafs = MayHaveCafRefs
+  | is_caf || mentions_cafs 
+                            = MayHaveCafRefs
   | otherwise 		    = NoCafRefs
  where
   mentions_cafs = isFastTrue (cafRefs p expr)
   is_caf = not (arity > 0 || rhsIsStatic this_pkg expr)
+
   -- NB. we pass in the arity of the expression, which is expected
   -- to be calculated by exprArity.  This is because exprArity
   -- knows how much eta expansion is going to be done by