projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NCG: Refactor representation of code with liveness info
[ghc-hetmet.git]
/
compiler
/
nativeGen
/
RegAlloc
/
Graph
/
Coalesce.hs
diff --git
a/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
b/compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
index
a5d95a3
..
e0fad17
100644
(file)
--- a/
compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
+++ b/
compiler/nativeGen/RegAlloc/Graph/Coalesce.hs
@@
-73,8
+73,8
@@
slurpJoinMovs live
slurpCmm rs (CmmProc _ _ _ sccs) = foldl' slurpBlock rs (flattenSCCs sccs)
slurpBlock rs (BasicBlock _ instrs) = foldl' slurpLI rs instrs
slurpCmm rs (CmmProc _ _ _ sccs) = foldl' slurpBlock rs (flattenSCCs sccs)
slurpBlock rs (BasicBlock _ instrs) = foldl' slurpLI rs instrs
- slurpLI rs (Instr _ Nothing) = rs
- slurpLI rs (Instr instr (Just live))
+ slurpLI rs (LiveInstr _ Nothing) = rs
+ slurpLI rs (LiveInstr instr (Just live))
| Just (r1, r2) <- takeRegRegMoveInstr instr
, elementOfUniqSet r1 $ liveDieRead live
, elementOfUniqSet r2 $ liveBorn live
| Just (r1, r2) <- takeRegRegMoveInstr instr
, elementOfUniqSet r1 $ liveDieRead live
, elementOfUniqSet r2 $ liveBorn live
@@
-86,8
+86,5
@@
slurpJoinMovs live
| otherwise
= rs
| otherwise
= rs
-
- slurpLI rs SPILL{} = rs
- slurpLI rs RELOAD{} = rs