# HG changeset patch # User Thomas Wuerthinger # Date 1421940304 -3600 # Node ID 837d2b18a17165e441272262ac4454231f4910cf # Parent fede93375dcb9359e113d4b316b706eeb938d9fa No need to clean up deleted phis. diff -r fede93375dcb -r 837d2b18a171 graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Jan 22 16:24:36 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Jan 22 16:25:04 2015 +0100 @@ -1150,7 +1150,6 @@ parser.setCurrentFrameState(frameState); currentBlock = block; - frameState.cleanupDeletedPhis(); if (lastInstr instanceof MergeNode) { int bci = block.startBci; if (block instanceof ExceptionDispatchBlock) { diff -r fede93375dcb -r 837d2b18a171 graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Thu Jan 22 16:24:36 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java Thu Jan 22 16:25:04 2015 +0100 @@ -326,15 +326,6 @@ return phi; } - public void cleanupDeletedPhis() { - for (int i = 0; i < localsSize(); i++) { - if (localAt(i) != null && localAt(i).isDeleted()) { - assert localAt(i) instanceof ValuePhiNode || localAt(i) instanceof ProxyNode : "Only phi and value proxies can be deleted during parsing: " + localAt(i); - storeLocal(i, null); - } - } - } - /** * Adds a locked monitor to this frame state. *