[commit: ghc] master: Comments only (693857f)
git at git.haskell.org
git at git.haskell.org
Fri Apr 27 07:26:50 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/693857f3a890dd061e19c70d4863b2258d97ff09/ghc
>---------------------------------------------------------------
commit 693857f3a890dd061e19c70d4863b2258d97ff09
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Jan 12 17:31:06 2018 +0000
Comments only
>---------------------------------------------------------------
693857f3a890dd061e19c70d4863b2258d97ff09
compiler/simplCore/SimplUtils.hs | 3 ++-
compiler/simplCore/Simplify.hs | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index 7c0689d..fbf9b3e 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -1116,7 +1116,8 @@ preInlineUnconditionally env top_lvl bndr rhs rhs_env
| not active = Nothing
| isTopLevel top_lvl && isBottomingId bndr = Nothing -- Note [Top-level bottoming Ids]
| isCoVar bndr = Nothing -- Note [Do not inline CoVars unconditionally]
- | isExitJoinId bndr = Nothing -- Note [Do not inline exit join points] in Exitify
+ | isExitJoinId bndr = Nothing -- Note [Do not inline exit join points]
+ -- in module Exitify
| not (one_occ (idOccInfo bndr)) = Nothing
| not (isStableUnfolding unf) = Just (extend_subst_with rhs)
diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index d92f6d7..249d19f 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -3292,7 +3292,7 @@ simplLetUnfolding env top_lvl cont_mb id new_rhs rhs_ty unf
| isStableUnfolding unf
= simplStableUnfolding env top_lvl cont_mb id unf rhs_ty
| isExitJoinId id
- = return noUnfolding -- see Note [Do not inline exit join points]
+ = return noUnfolding -- See Note [Do not inline exit join points] in Exitify
| otherwise
= mkLetUnfolding (seDynFlags env) top_lvl InlineRhs id new_rhs
More information about the ghc-commits
mailing list