Mercurial > hg > truffle

changeset 19539:34462e7f0278

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up phi nodes in PEA.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 22 Feb 2015 17:50:30 +0100
parents fac54d234f30
children 9a749d774c73
files graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Sun Feb 22 17:17:45 2015 +0100
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Sun Feb 22 17:50:30 2015 +0100
@@ -649,6 +649,7 @@
                 if (uniqueVirtualObject) {
                     // all inputs refer to the same object: just make the phi node an alias
                     addAndMarkAlias(objStates[0].virtual, phi);
+                    mergeEffects.deleteNode(phi);
                     return false;
                 } else {
                     // all inputs are virtual: check if they're compatible and without identity
@@ -680,6 +681,7 @@
                     if (compatible) {
                         VirtualObjectNode virtual = getValueObjectVirtual(phi, getObjectState(states.get(0), phi.valueAt(0)).virtual);
                         mergeEffects.addFloatingNode(virtual, "valueObjectNode");
+                        mergeEffects.deleteNode(phi);
 
                         boolean materialized = mergeObjectStates(virtual, objStates, states);
                         addAndMarkAlias(virtual, virtual);