diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-01-07 02:44:39 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-01-25 05:22:20 -0500 |
| commit | 6e2d9ee25bce06ae51d2f1cf8df4f7422106a383 (patch) | |
| tree | 4bb0aa9527bc0bed4fb2e991eb02d0f031d514bf /compiler/nativeGen/RegAlloc/Linear | |
| parent | c3fde723633d1788e4ded8c6f59eb7cef1ae95fd (diff) | |
| download | haskell-6e2d9ee25bce06ae51d2f1cf8df4f7422106a383.tar.gz | |
Module hierarchy: Cmm (cf #13009)
Diffstat (limited to 'compiler/nativeGen/RegAlloc/Linear')
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Linear/Base.hs | 2 | ||||
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs | 4 | ||||
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Linear/Main.hs | 8 | ||||
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Linear/State.hs | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/compiler/nativeGen/RegAlloc/Linear/Base.hs b/compiler/nativeGen/RegAlloc/Linear/Base.hs index ad0fafb3ed..3c6965c1dd 100644 --- a/compiler/nativeGen/RegAlloc/Linear/Base.hs +++ b/compiler/nativeGen/RegAlloc/Linear/Base.hs @@ -28,7 +28,7 @@ import Outputable import Unique import UniqFM import UniqSupply -import BlockId +import GHC.Cmm.BlockId -- | Used to store the register assignment on entry to a basic block. diff --git a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs b/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs index 546d48af21..c21ab1bea1 100644 --- a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs +++ b/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs @@ -18,8 +18,8 @@ import RegAlloc.Liveness import Instruction import Reg -import BlockId -import Hoopl.Collections +import GHC.Cmm.BlockId +import GHC.Cmm.Dataflow.Collections import Digraph import DynFlags import Outputable diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs index eac9194c6a..bccffb208c 100644 --- a/compiler/nativeGen/RegAlloc/Linear/Main.hs +++ b/compiler/nativeGen/RegAlloc/Linear/Main.hs @@ -119,9 +119,9 @@ import RegAlloc.Liveness import Instruction import Reg -import BlockId -import Hoopl.Collections -import Cmm hiding (RegSet) +import GHC.Cmm.BlockId +import GHC.Cmm.Dataflow.Collections +import GHC.Cmm hiding (RegSet) import Digraph import DynFlags @@ -777,7 +777,7 @@ allocateRegsAndSpill reading keep spills alloc (r:rs) -- NOTE: if the input to the NCG contains some -- unreachable blocks with junk code, this panic -- might be triggered. Make sure you only feed - -- sensible code into the NCG. In CmmPipeline we + -- sensible code into the NCG. In GHC.Cmm.Pipeline we -- call removeUnreachableBlocks at the end for this -- reason. diff --git a/compiler/nativeGen/RegAlloc/Linear/State.hs b/compiler/nativeGen/RegAlloc/Linear/State.hs index 43b8f6c129..d24690f04c 100644 --- a/compiler/nativeGen/RegAlloc/Linear/State.hs +++ b/compiler/nativeGen/RegAlloc/Linear/State.hs @@ -44,7 +44,7 @@ import RegAlloc.Linear.Base import RegAlloc.Liveness import Instruction import Reg -import BlockId +import GHC.Cmm.BlockId import DynFlags import Unique |