projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c93bd73
)
reinstate eta-expansion during SimplGently, to fix inlining of sequence_
author
Simon Marlow
<marlowsd@gmail.com>
Fri, 23 Apr 2010 12:48:53 +0000
(12:48 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Fri, 23 Apr 2010 12:48:53 +0000
(12:48 +0000)
compiler/simplCore/SimplUtils.lhs
patch
|
blob
|
history
diff --git
a/compiler/simplCore/SimplUtils.lhs
b/compiler/simplCore/SimplUtils.lhs
index
500f286
..
fbee984
100644
(file)
--- a/
compiler/simplCore/SimplUtils.lhs
+++ b/
compiler/simplCore/SimplUtils.lhs
@@
-1010,7
+1010,7
@@
mkLam :: SimplEnv -> [OutBndr] -> OutExpr -> SimplM OutExpr
mkLam _b [] body
= return body
mkLam _b [] body
= return body
-mkLam env bndrs body
+mkLam _env bndrs body
= do { dflags <- getDOptsSmpl
; mkLam' dflags bndrs body }
where
= do { dflags <- getDOptsSmpl
; mkLam' dflags bndrs body }
where
@@
-1031,9
+1031,6
@@
mkLam env bndrs body
; return etad_lam }
| dopt Opt_DoLambdaEtaExpansion dflags,
; return etad_lam }
| dopt Opt_DoLambdaEtaExpansion dflags,
- not (inGentleMode env), -- In gentle mode don't eta-expansion
- -- because it can clutter up the code
- -- with casts etc that may not be removed
not (all isTyVar bndrs) -- Don't eta expand type abstractions
= do { let body' = tryEtaExpansion dflags body
; return (mkLams bndrs body') }
not (all isTyVar bndrs) -- Don't eta expand type abstractions
= do { let body' = tryEtaExpansion dflags body
; return (mkLams bndrs body') }