diff options
| author | Gabor Greif <ggreif@gmail.com> | 2017-09-25 12:31:12 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2017-09-26 11:13:14 +0200 |
| commit | 7446c7f68bd5addd2f2db0d8d5910fb963869c47 (patch) | |
| tree | 05ecf5d25cdecb2893424cd07b0e7002b32ea2c4 /compiler/simplCore | |
| parent | 2f8e6e7f8696213b95e3461224909c3b2ec4f7aa (diff) | |
| download | haskell-7446c7f68bd5addd2f2db0d8d5910fb963869c47.tar.gz | |
A bunch of typofixes
Diffstat (limited to 'compiler/simplCore')
| -rw-r--r-- | compiler/simplCore/SimplUtils.hs | 4 | ||||
| -rw-r--r-- | compiler/simplCore/Simplify.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs index bf09f7261d..ebdda8f62a 100644 --- a/compiler/simplCore/SimplUtils.hs +++ b/compiler/simplCore/SimplUtils.hs @@ -865,7 +865,7 @@ f when it is inlined. So our conservative plan (implemented by updModeForStableUnfoldings) is this: ------------------------------------------------------------- - When simplifying the RHS of an stable unfolding, set the phase + When simplifying the RHS of a stable unfolding, set the phase to the phase in which the stable unfolding first becomes active ------------------------------------------------------------- @@ -1304,7 +1304,7 @@ ones that are trivial): Note [Stable unfoldings and postInlineUnconditionally] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Do not do postInlineUnconditionally if the Id has an stable unfolding, +Do not do postInlineUnconditionally if the Id has a stable unfolding, otherwise we lose the unfolding. Example -- f has stable unfolding with rhs (e |> co) diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs index c73f0f6545..5e596a3fea 100644 --- a/compiler/simplCore/Simplify.hs +++ b/compiler/simplCore/Simplify.hs @@ -3068,7 +3068,7 @@ and c is unused. Note [Duplicated env] ~~~~~~~~~~~~~~~~~~~~~ Some of the alternatives are simplified, but have not been turned into a join point -So they *must* have an zapped subst-env. So we can't use completeNonRecX to +So they *must* have a zapped subst-env. So we can't use completeNonRecX to bind the join point, because it might to do PostInlineUnconditionally, and we'd lose that when zapping the subst-env. We could have a per-alt subst-env, but zapping it (as we do in mkDupableCont, the Select case) is safe, and @@ -3329,7 +3329,7 @@ Note [Setting the new unfolding] important: if exprIsConApp says 'yes' for a recursive thing, then we can get into an infinite loop -If there's an stable unfolding on a loop breaker (which happens for +If there's a stable unfolding on a loop breaker (which happens for INLINABLE), we hang on to the inlining. It's pretty dodgy, but the user did say 'INLINE'. May need to revisit this choice. |