diff options
| author | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
| commit | 5a1b4f814f74ec1c48152d97523744518e212777 (patch) | |
| tree | 7c2207ecacbd37f12c78dbcf9d4334827164e0fb /compiler/coreSyn/CoreUnfold.hs | |
| parent | 6757950cdd8bb0af0355539987ee78401a6a8f6b (diff) | |
| parent | 808bbdf08058785ae5bc59b5b4f2b04951d4cbbf (diff) | |
| download | haskell-wip/orf-reboot.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot
Conflicts:
compiler/rename/RnNames.hs
compiler/typecheck/TcRnMonad.hs
utils/haddock
Diffstat (limited to 'compiler/coreSyn/CoreUnfold.hs')
| -rw-r--r-- | compiler/coreSyn/CoreUnfold.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs index b04c13d886..edbe503fc4 100644 --- a/compiler/coreSyn/CoreUnfold.hs +++ b/compiler/coreSyn/CoreUnfold.hs @@ -1239,7 +1239,7 @@ CONLIKE thing (modulo lets). Note [Lone variables] See also Note [Interaction of exprIsWorkFree and lone variables] ~~~~~~~~~~~~~~~~~~~~~ which appears below The "lone-variable" case is important. I spent ages messing about -with unsatisfactory varaints, but this is nice. The idea is that if a +with unsatisfactory variants, but this is nice. The idea is that if a variable appears all alone as an arg of lazy fn, or rhs BoringCtxt |