X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FFloatOut.lhs;h=6562c84e8c6eca17c14b148c8cecb401665a164e;hb=b71760aac3a1b2e7d772a4c0457ff3f19eac8631;hp=290c62313a6ec9b81ada63a84c269a2b4a176296;hpb=d95ce839533391e7118257537044f01cbb1d6694;p=ghc-hetmet.git

diff --git a/compiler/simplCore/FloatOut.lhs b/compiler/simplCore/FloatOut.lhs
index 290c623..6562c84 100644
--- a/compiler/simplCore/FloatOut.lhs
+++ b/compiler/simplCore/FloatOut.lhs
@@ -297,6 +297,13 @@ floatExpr lvl (Note note@(SCC cc) expr)
 	ann_bind (Rec pairs)
 	  = Rec [(binder, mkSCC dupd_cc rhs) | (binder, rhs) <- pairs]
 
+floatExpr _ (Note InlineMe expr)	-- Other than SCCs
+  = (zeroStats, [], Note InlineMe (unTag expr))
+	-- Do no floating at all inside INLINE.
+	-- The SetLevels pass did not clone the bindings, so it's
+	-- unsafe to do any floating, even if we dump the results
+	-- inside the Note (which is what we used to do).
+
 floatExpr lvl (Note note expr)	-- Other than SCCs
   = case (floatExpr lvl expr)    of { (fs, floating_defns, expr') ->
     (fs, floating_defns, Note note expr') }
@@ -337,6 +344,22 @@ floatList _ [] = (zeroStats, [], [])
 floatList f (a:as) = case f a		 of { (fs_a,  binds_a,  b)  ->
 		     case floatList f as of { (fs_as, binds_as, bs) ->
 		     (fs_a `add_stats` fs_as, binds_a ++ binds_as, b:bs) }}
+
+unTagBndr :: TaggedBndr tag -> CoreBndr
+unTagBndr (TB b _) = b
+
+unTag :: TaggedExpr tag -> CoreExpr
+unTag (Var v)  	  = Var v
+unTag (Lit l)  	  = Lit l
+unTag (Type ty)   = Type ty
+unTag (Note n e)  = Note n (unTag e)
+unTag (App e1 e2) = App (unTag e1) (unTag e2)
+unTag (Lam b e)   = Lam (unTagBndr b) (unTag e)
+unTag (Cast e co) = Cast (unTag e) co
+unTag (Let (Rec prs) e)    = Let (Rec [(unTagBndr b,unTag r) | (b, r) <- prs]) (unTag e)
+unTag (Let (NonRec b r) e) = Let (NonRec (unTagBndr b) (unTag r)) (unTag e)
+unTag (Case e b ty alts)   = Case (unTag e) (unTagBndr b) ty
+			          [(c, map unTagBndr bs, unTag r) | (c,bs,r) <- alts]
 \end{code}
 
 %************************************************************************