diff graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java @ 2603:01c5c0443158

new node layout: Phi
author Lukas Stadler <lukas.stadler@jku.at>
date Fri, 06 May 2011 11:18:15 +0200
parents 0c6564c254af
children 39aa89baa165
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Fri May 06 10:25:37 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Fri May 06 11:18:15 2011 +0200
@@ -443,7 +443,7 @@
                 throw new CiBailout("jsr/ret too complicated");
             }
 
-            existingState.merge(this, newState);
+            existingState.merge(this, newState, graph());
         }
     }
 
@@ -465,13 +465,13 @@
         int stackSize = newState.stackSize();
         for (int i = 0; i < stackSize; i++) {
             // always insert phis for the stack
-            newState.setupPhiForStack(this, i);
+            newState.setupPhiForStack(this, i, graph());
         }
         int localsSize = newState.localsSize();
         for (int i = 0; i < localsSize; i++) {
             Value x = newState.localAt(i);
             if (x != null) {
-                newState.setupPhiForLocal(this, i);
+                newState.setupPhiForLocal(this, i, graph());
             }
         }
     }