X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FFloatOut.lhs;h=199153110bc708a0987b54260c2a5e5efb101523;hb=4899cc823373bd016a49cdb0dffd0e22150ec07e;hp=c97bbce28e32a721b90669d0d0b600e010bf7830;hpb=2f41dd510a893312dfaa0d652f448cc3a045eb88;p=ghc-hetmet.git

diff --git a/compiler/simplCore/FloatOut.lhs b/compiler/simplCore/FloatOut.lhs
index c97bbce..1991531 100644
--- a/compiler/simplCore/FloatOut.lhs
+++ b/compiler/simplCore/FloatOut.lhs
@@ -11,7 +11,7 @@ module FloatOut ( floatOutwards ) where
 #include "HsVersions.h"
 
 import CoreSyn
-import CoreUtils	( mkSCC, exprIsHNF, exprIsTrivial )
+import CoreUtils
 
 import DynFlags	( DynFlags, DynFlag(..), FloatOutSwitches(..) )
 import ErrUtils		( dumpIfSet_dyn )
@@ -224,7 +224,7 @@ floatCaseAlt lvl arg	-- Used rec rhss, and case-alternative rhss
 floatRhs lvl arg	-- Used for nested non-rec rhss, and fn args
 			-- See Note [Floating out of RHS]
   = case (floatExpr lvl arg) of { (fsa, floats, arg') ->
-    if exprIsHNF arg' || exprIsTrivial arg' then
+    if exprIsCheap arg' then	
 	(fsa, floats, arg')
     else
     case (partitionByMajorLevel lvl floats) of { (floats', heres) ->
@@ -250,6 +250,9 @@ floatRhs lvl arg	-- Used for nested non-rec rhss, and fn args
 --	bindings just after the '='.  And some of them might (correctly)
 --	be strict even though the 'let f' is lazy, because f, being a value,
 --	gets its demand-info zapped by the simplifier.
+--
+-- We use exprIsCheap because that is also what's used by the simplifier
+-- to decide whether to float a let out of a let
 
 floatExpr _ (Var v)   = (zeroStats, [], Var v)
 floatExpr _ (Type ty) = (zeroStats, [], Type ty)
@@ -323,8 +326,9 @@ floatExpr lvl (Cast expr co)
 
 floatExpr lvl (Let (NonRec (TB bndr bndr_lvl) rhs) body)
   | isUnLiftedType (idType bndr)	-- Treat unlifted lets just like a case
-  = case floatExpr lvl rhs	of { (fs, rhs_floats, rhs') ->
-    case floatRhs bndr_lvl body of { (fs, body_floats, body') ->
+				-- I.e. floatExpr for rhs, floatCaseAlt for body
+  = case floatExpr lvl rhs	    of { (fs, rhs_floats, rhs') ->
+    case floatCaseAlt bndr_lvl body of { (fs, body_floats, body') ->
     (fs, rhs_floats ++ body_floats, Let (NonRec bndr rhs') body') }}
 
 floatExpr lvl (Let bind body)