Mercurial > hg > graal-compiler

diff graal/GraalCompiler/src/com/sun/c1x/ir/Merge.java @ 2866:7f14e6b48a9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added dead code elimination added ValueAnchor (temp workaround) more inlining logic (now uses DCE) IdealGraphPrinter: print even if Scheduler fails added inlining and DCE tracing options to C1XOptions
author Lukas Stadler <lukas.stadler@jku.at>
date Tue, 07 Jun 2011 16:27:08 +0200
parents 7596ae867a7b
children 5c545fef2c81
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Merge.java	Wed Jun 01 16:56:54 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Merge.java	Tue Jun 07 16:27:08 2011 +0200
@@ -268,15 +268,15 @@
         return x;
     }
 
-    public void removePhiPredecessor(ExceptionDispatch successor) {
-        int predIndex = predecessors().indexOf(successor);
+    public void removePhiPredecessor(Node pred) {
+        int predIndex = predecessors().lastIndexOf(pred);
         assert predIndex != -1;
 
         for (Node usage : usages()) {
             if (usage instanceof Phi) {
                 Phi phi = (Phi) usage;
-                assert phi.valueCount() == predecessors().size();
-                phi.removeInput(predIndex + 1);
+//                assert phi.valueCount() == predecessors().size();
+                phi.removeInput(predIndex);
             }
         }
     }