diff options
| author | Dimitrios Vytiniotis <dimitris@microsoft.com> | 2011-11-16 15:28:43 +0000 |
|---|---|---|
| committer | Dimitrios Vytiniotis <dimitris@microsoft.com> | 2011-11-16 15:28:43 +0000 |
| commit | 7ec5404a3fd277251a1ab353aa398adfc02b6d34 (patch) | |
| tree | 78ff33800fad55d7dbb4e1b1732d4f82c4e092a2 /compiler/specialise | |
| parent | db892577a2effc2266533e355dad2c40f9fd3be1 (diff) | |
| parent | 1bbb89f3ab009367fcca84b73b351ddcf5be16a4 (diff) | |
| download | haskell-ghc-constraint-solver.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-constraint-solverghc-constraint-solver
Diffstat (limited to 'compiler/specialise')
| -rw-r--r-- | compiler/specialise/SpecConstr.lhs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/specialise/SpecConstr.lhs b/compiler/specialise/SpecConstr.lhs index 12492836ab..d2c07bcc1b 100644 --- a/compiler/specialise/SpecConstr.lhs +++ b/compiler/specialise/SpecConstr.lhs @@ -31,6 +31,7 @@ import CoreUtils import CoreUnfold ( couldBeSmallEnoughToInline ) import CoreFVs ( exprsFreeVars ) import CoreMonad +import Literal ( litIsLifted ) import HscTypes ( ModGuts(..) ) import WwLib ( mkWorkerArgs ) import DataCon @@ -1714,7 +1715,8 @@ argsToPats env in_scope val_env args occs \begin{code} isValue :: ValueEnv -> CoreExpr -> Maybe Value isValue _env (Lit lit) - = Just (ConVal (LitAlt lit) []) + | litIsLifted lit = Nothing + | otherwise = Just (ConVal (LitAlt lit) []) isValue env (Var v) | Just stuff <- lookupVarEnv env v |