diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2017-02-28 20:39:02 -0500 |
|---|---|---|
| committer | David Feuer <David.Feuer@gmail.com> | 2017-02-28 20:39:03 -0500 |
| commit | 2ab6ce783de9455369c12bb17afb4f596bb6ef06 (patch) | |
| tree | b0556ece31eebbc8f9dcec62d2b022d85baafd04 /compiler/simplCore | |
| parent | 777b77077f3d6b794f96414a16e904452e1e6aba (diff) | |
| download | haskell-2ab6ce783de9455369c12bb17afb4f596bb6ef06.tar.gz | |
Move isJoinId, isJoinId_maybe to Id
This is just a refactoring, moving these two functions where
they belong.
The reason they were there was because of the use of isJoinId_maybe
in the OutputableBndr instance of TaggedBndr, which was in CoreSyn.
I moved it to PprCore, to join the OutputableBndr instance for
Var. That makes more sense anyway.
Reviewers: austin, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D3207
Diffstat (limited to 'compiler/simplCore')
| -rw-r--r-- | compiler/simplCore/CSE.hs | 5 | ||||
| -rw-r--r-- | compiler/simplCore/FloatIn.hs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler/simplCore/CSE.hs b/compiler/simplCore/CSE.hs index 0feb676714..b8e26b593e 100644 --- a/compiler/simplCore/CSE.hs +++ b/compiler/simplCore/CSE.hs @@ -11,10 +11,11 @@ module CSE (cseProgram, cseOneExpr) where #include "HsVersions.h" import CoreSubst -import Var ( Var, isJoinId ) +import Var ( Var ) import VarEnv ( elemInScopeSet ) import Id ( Id, idType, idInlineActivation, isDeadBinder - , zapIdOccInfo, zapIdUsageInfo, idInlinePragma ) + , zapIdOccInfo, zapIdUsageInfo, idInlinePragma + , isJoinId ) import CoreUtils ( mkAltExpr, eqExpr , exprIsLiteralString , stripTicksE, stripTicksT, mkTicks ) diff --git a/compiler/simplCore/FloatIn.hs b/compiler/simplCore/FloatIn.hs index cabdc3b430..4d5a564257 100644 --- a/compiler/simplCore/FloatIn.hs +++ b/compiler/simplCore/FloatIn.hs @@ -25,7 +25,7 @@ import CoreUtils ( exprIsDupable, exprIsExpandable, exprOkForSideEffects, mkTicks ) import CoreFVs import CoreMonad ( CoreM ) -import Id ( isOneShotBndr, idType ) +import Id ( isOneShotBndr, idType, isJoinId, isJoinId_maybe ) import Var import Type ( isUnliftedType ) import VarSet |