diff options
| author | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2014-08-08 18:01:19 +0200 |
| commit | 5f003d228340c3ce8e500f9053f353c58dc1dc94 (patch) | |
| tree | a855b0f173ff635b48354e1136ef6cbb2a1214a4 /compiler/cmm/CmmLayoutStack.hs | |
| parent | ff9c5570395bcacf8963149b3a8475f5644ce694 (diff) | |
| parent | dff0623d5ab13222c06b3ff6b32793e05b417970 (diff) | |
| download | haskell-wip/generics-propeq.tar.gz | |
Merge branch 'master' into wip/generics-propeqwip/generics-propeq
Conflicts:
compiler/typecheck/TcGenGenerics.lhs
Diffstat (limited to 'compiler/cmm/CmmLayoutStack.hs')
| -rw-r--r-- | compiler/cmm/CmmLayoutStack.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/cmm/CmmLayoutStack.hs b/compiler/cmm/CmmLayoutStack.hs index db22deb639..c582b783f2 100644 --- a/compiler/cmm/CmmLayoutStack.hs +++ b/compiler/cmm/CmmLayoutStack.hs @@ -870,7 +870,7 @@ areaToSp _ _ _ _ other = other -- really the job of the stack layout algorithm, hence we do it now. optStackCheck :: CmmNode O C -> CmmNode O C -optStackCheck n = -- Note [null stack check] +optStackCheck n = -- Note [Always false stack check] case n of CmmCondBranch (CmmLit (CmmInt 0 _)) _true false -> CmmBranch false other -> other |