changeset 19953:69215066602a

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 19 Mar 2015 11:22:37 +0100
parents a9145e7b14b4 (current diff) 59c2d62927f7 (diff)
children c39d8bafd342
files
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Wed Mar 18 23:26:47 2015 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Thu Mar 19 11:22:37 2015 +0100
@@ -249,6 +249,9 @@
                     return true;
                 } else {
                     customCanonicalizer.simplify(node, tool);
+                    if (node.isDeleted()) {
+                        return true;
+                    }
                 }
             }
             if (nodeClass.isCanonicalizable()) {