Mercurial > hg > truffle

changeset 6586:cfd5c59df26a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing intermediate materializations when merge has frame state (pending bug fix)
author Doug Simon <doug.simon@oracle.com>
date Mon, 29 Oct 2012 14:47:07 +0100
parents 5c1787a0be00
children 795df1687282 b89b5038ad7e
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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) {