changeset 16155:c903c4e693bf

run simplification if canonicalization is unsuccessful
author Lukas Stadler <lukas.stadler@oracle.com>
date Fri, 20 Jun 2014 12:09:46 +0200
parents f9f7bd1a6b2c
children 0993768dfc8e
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Mon Jun 23 13:13:41 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Fri Jun 20 12:09:46 2014 +0200
@@ -234,7 +234,9 @@
                 METRIC_CANONICALIZATION_CONSIDERED_NODES.increment();
                 try (Scope s = Debug.scope("CanonicalizeNode", node)) {
                     Node canonical = node.canonical(tool);
-                    return performReplacement(node, canonical);
+                    if (performReplacement(node, canonical)) {
+                        return true;
+                    }
                 } catch (Throwable e) {
                     throw Debug.handle(e);
                 }
@@ -248,8 +250,9 @@
                 } catch (Throwable e) {
                     throw Debug.handle(e);
                 }
+                return node.isDeleted();
             }
-            return node.isDeleted();
+            return false;
         }
 
 // @formatter:off