--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Wed Apr 02 10:06:49 2014 +0200
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Wed Apr 02 10:08:00 2014 +0200
@@ -366,7 +366,7 @@
     }
 
     @Override
-    protected void ifNode(Value x, Condition cond, Value y) {
+    protected void genIf(Value x, Condition cond, Value y) {
         assert currentBlock.getSuccessors().size() == 2;
         BciBlock trueBlock = currentBlock.getSuccessors().get(0);
         BciBlock falseBlock = currentBlock.getSuccessors().get(1);

--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java	Wed Apr 02 10:06:49 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java	Wed Apr 02 10:08:00 2014 +0200
@@ -519,25 +519,25 @@
 
     protected abstract T genUnique(T x);
 
-    protected abstract void ifNode(T x, Condition cond, T y);
+    protected abstract void genIf(T x, Condition cond, T y);
 
     private void genIfZero(Condition cond) {
         T y = appendConstant(Constant.INT_0);
         T x = frameState.ipop();
-        ifNode(x, cond, y);
+        genIf(x, cond, y);
     }
 
     private void genIfNull(Condition cond) {
         T y = appendConstant(Constant.NULL_OBJECT);
         T x = frameState.apop();
-        ifNode(x, cond, y);
+        genIf(x, cond, y);
     }
 
     private void genIfSame(Kind kind, Condition cond) {
         T y = frameState.pop(kind);
         T x = frameState.pop(kind);
         // assert !x.isDeleted() && !y.isDeleted();
-        ifNode(x, cond, y);
+        genIf(x, cond, y);
     }
 
     protected abstract void genThrow();

--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Wed Apr 02 10:06:49 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Wed Apr 02 10:08:00 2014 +0200
@@ -588,7 +588,7 @@
                 return (ValueNode) currentGraph.unique((Node & ValueNumberable) x);
             }
 
-            protected ValueNode genIf(ValueNode condition, ValueNode falseSuccessor, ValueNode trueSuccessor, double d) {
+            protected ValueNode genIfNode(ValueNode condition, ValueNode falseSuccessor, ValueNode trueSuccessor, double d) {
                 return new IfNode((LogicNode) condition, (FixedNode) falseSuccessor, (FixedNode) trueSuccessor, d);
             }
 
@@ -1372,7 +1372,7 @@
             }
 
             @Override
-            protected void ifNode(ValueNode x, Condition cond, ValueNode y) {
+            protected void genIf(ValueNode x, Condition cond, ValueNode y) {
                 // assert !x.isDeleted() && !y.isDeleted();
                 // assert currentBlock.numNormalSuccessors() == 2;
                 assert currentBlock.getSuccessors().size() == 2;
@@ -1422,7 +1422,7 @@
                 ValueNode trueSuccessor = createBlockTarget(probability, trueBlock, frameState);
                 ValueNode falseSuccessor = createBlockTarget(1 - probability, falseBlock, frameState);
 
-                ValueNode ifNode = negate ? genIf(condition, falseSuccessor, trueSuccessor, 1 - probability) : genIf(condition, trueSuccessor, falseSuccessor, probability);
+                ValueNode ifNode = negate ? genIfNode(condition, falseSuccessor, trueSuccessor, 1 - probability) : genIfNode(condition, trueSuccessor, falseSuccessor, probability);
                 append(ifNode);
             }