projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e8b6200
)
correct two single-identifier bugs that stopped the Adams optimization from working
author
Norman Ramsey
<nr@eecs.harvard.edu>
Tue, 11 Sep 2007 14:29:14 +0000
(14:29 +0000)
committer
Norman Ramsey
<nr@eecs.harvard.edu>
Tue, 11 Sep 2007 14:29:14 +0000
(14:29 +0000)
compiler/cmm/CmmProcPointZ.hs
patch
|
blob
|
history
diff --git
a/compiler/cmm/CmmProcPointZ.hs
b/compiler/cmm/CmmProcPointZ.hs
index
ed4f54e
..
c5d7177
100644
(file)
--- a/
compiler/cmm/CmmProcPointZ.hs
+++ b/
compiler/cmm/CmmProcPointZ.hs
@@
-151,7
+151,7
@@
extendPPSet g blocks procPoints =
-- more proc points than b and is not already a proc
-- point. If found, it can become a proc point.
newId succ_id = not (elemBlockSet succ_id procPoints') &&
-- more proc points than b and is not already a proc
-- point. If found, it can become a proc point.
newId succ_id = not (elemBlockSet succ_id procPoints') &&
- nreached id > my_nreached
+ nreached succ_id > my_nreached
in listToMaybe $ filter newId $ succs b
in listToMaybe $ filter newId $ succs b
@@
-246,7
+246,7
@@
addProcPointProtocols procPoints formals g =
let (Block _ t) = lookupBlockEnv (gr_blocks g) id `orElse`
panic "jump out of graph"
in case t of
let (Block _ t) = lookupBlockEnv (gr_blocks g) id `orElse`
panic "jump out of graph"
in case t of
- ZTail (CopyOut {}) (ZLast (LastOther (LastBranch pee [])))
+ ZTail (CopyIn {}) (ZLast (LastOther (LastBranch pee [])))
| elemBlockSet pee procPoints -> Just pee
_ -> Nothing
init_protocols = fold_blocks maybe_add_proto emptyBlockEnv g
| elemBlockSet pee procPoints -> Just pee
_ -> Nothing
init_protocols = fold_blocks maybe_add_proto emptyBlockEnv g