X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FsimplCore%2FConFold.lhs;fp=ghc%2Fcompiler%2FsimplCore%2FConFold.lhs;h=7c09ad11daa92058fd2f8a7cf42abb474a1b818e;hb=63592052b4746774966913134a298ff31298ac37;hp=fdc3ecaa58be8ae8e2353e0290bd6fe6cab6ae93;hpb=cccb9a1aead5d225caee75b2c4669de94ce0cc57;p=ghc-hetmet.git diff --git a/ghc/compiler/simplCore/ConFold.lhs b/ghc/compiler/simplCore/ConFold.lhs index fdc3eca..7c09ad1 100644 --- a/ghc/compiler/simplCore/ConFold.lhs +++ b/ghc/compiler/simplCore/ConFold.lhs @@ -13,7 +13,7 @@ module ConFold ( completePrim ) where #include "HsVersions.h" import CoreSyn -import CoreUnfold ( Unfolding, SimpleUnfolding ) +import CoreUnfold ( Unfolding ) import Id ( idType ) import Literal ( mkMachInt, mkMachWord, Literal(..) ) import PrimOp ( PrimOp(..) ) @@ -90,7 +90,7 @@ completePrim env SeqOp [TyArg ty, LitArg lit] = returnSmpl (Lit (mkMachInt 1)) completePrim env op@SeqOp args@[TyArg ty, VarArg var] - | isEvaluated (lookupRhsInfo env var) = returnSmpl (Lit (mkMachInt 1)) -- var is eval'd + | isEvaluated (lookupUnfolding env var) = returnSmpl (Lit (mkMachInt 1)) -- var is eval'd | otherwise = returnSmpl (Prim op args) -- var not eval'd \end{code}