X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FTidyPgm.lhs;h=6b89b33fb3ed1478eef2934106779cd01b4616e4;hb=43f19eec0ec4c507be2391d66ff53e79a8580561;hp=331d921489d4f7cd30cba6914ed7c9bc3308d283;hpb=d5934bbb856aa0aa620c9b2e0fa51c90a1a5a048;p=ghc-hetmet.git

diff --git a/compiler/main/TidyPgm.lhs b/compiler/main/TidyPgm.lhs
index 331d921..6b89b33 100644
--- a/compiler/main/TidyPgm.lhs
+++ b/compiler/main/TidyPgm.lhs
@@ -21,7 +21,8 @@ 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 )
@@ -31,7 +32,7 @@ import Name		( Name, getOccName, nameOccName, mkInternalName,
 		  	  localiseName, isExternalName, nameSrcLoc,
 			  isWiredInName, getName
 			)
-import NameSet		( NameSet, elemNameSet )
+import NameSet		( NameSet, elemNameSet, filterNameSet )
 import IfaceEnv		( allocateGlobalBinder )
 import NameEnv		( filterNameEnv, mapNameEnv )
 import OccName		( TidyOccEnv, initTidyOccEnv, tidyOccName )
@@ -123,7 +124,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 +140,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,9 +244,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_hpc_info = hpc_info })
+			        mg_hpc_info = hpc_info,
+                                mg_modBreaks = modBreaks })
 
   = do	{ let dflags = hsc_dflags hsc_env
 	; showPass dflags "Tidy Core"
@@ -279,6 +287,12 @@ tidyProgram hsc_env
 	      ; implicit_binds = getImplicitBinds type_env
 	      ; all_tidy_binds = implicit_binds ++ tidy_binds
 	      ; alg_tycons = filter isAlgTyCon (typeEnvTyCons type_env)
+
+              ; tidy_vect_info = VectInfo 
+                                   (filterNameSet (isElemId type_env) 
+                                                  (vectInfoCCVar vect_info))
+                -- filter against `type_env', not `tidy_type_env', as we must
+                -- keep all implicit names
 	      }
 
    	; endPass dflags "Tidy Core" Opt_D_dump_simpl all_tidy_binds
@@ -298,7 +312,10 @@ tidyProgram hsc_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 = tidy_vect_info
+                              })
 	}
 
 lookup_dfun type_env dfun_id
@@ -306,6 +323,11 @@ lookup_dfun type_env dfun_id
 	Just (AnId dfun_id') -> dfun_id'
 	other -> pprPanic "lookup_dfun" (ppr dfun_id)
 
+isElemId type_env name
+  = case lookupTypeEnv type_env name of
+	Just (AnId _) -> True
+	_             -> False
+
 tidyTypeEnv :: Bool -> NameSet -> TypeEnv -> [CoreBind] -> TypeEnv
 
 -- The competed type environment is gotten from
@@ -791,17 +813,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 || is_tick
+  | is_caf || mentions_cafs 
                             = MayHaveCafRefs
   | otherwise 		    = NoCafRefs
  where
   mentions_cafs = isFastTrue (cafRefs p expr)
   is_caf = not (arity > 0 || rhsIsStatic this_pkg expr)
-  is_tick = case expr of
-	      Note (TickBox {}) _       -> True
-	      Note (BinaryTickBox {}) _ -> True
-	      _                         -> False
-        
+
   -- 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