# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1362493746 -3600
# Node ID 9e3c0d8bca65fa531c27f0acdec0796b9d41b6e9
# Parent  c7d7d9936809468093abcae63b562748b057f40e# Parent  17d0bdb44cb61034b0352fc846653ebd3b382b64
Merge.

diff -r c7d7d9936809 -r 9e3c0d8bca65 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java	Tue Mar 05 15:20:35 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java	Tue Mar 05 15:29:06 2013 +0100
@@ -152,10 +152,8 @@
                 ((StructuredGraph) graph()).removeSplit(this, falseSuccessor());
             }
         } else if (trueSuccessor().guards().isEmpty() && falseSuccessor().guards().isEmpty()) {
-            if (removeOrMaterializeIf(tool)) {
-                return;
-            } else if (removeIntermediateMaterialization(tool)) {
-                return;
+            if (!removeOrMaterializeIf(tool)) {
+                removeIntermediateMaterialization(tool);
             }
         }
     }