# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1351518427 -3600
# Node ID cfd5c59df26a2a7e10eb77c046569f34594b113c
# Parent  5c1787a0be00733135efe91fa7c960150ad69712
removing intermediate materializations when merge has frame state (pending bug fix)

diff -r 5c1787a0be00 -r cfd5c59df26a 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	Mon Oct 29 14:44:53 2012 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java	Mon Oct 29 14:47:07 2012 +0100
@@ -237,6 +237,12 @@
             return false;
         }
 
+        if (merge.stateAfter() != null) {
+            // TODO (ds) remove once scheduling issue (sometimes) triggered by compiling org.eclipse.jdt.core.tests.util.Util::unzip is fixed.
+            // Command to reproduce: mx dacapo 4 eclipse -esa -G:+DumpOnError
+            return false;
+        }
+
         // Only consider merges with a single usage that is both a phi and an operand of the comparison
         NodeUsagesList mergeUsages = merge.usages();
         if (mergeUsages.count() != 1) {