Mercurial > hg > graal-compiler
changeset 11224:679ba643aa71
CR-917 fix for ExceptionObjectNode
author | Mick Jordan <mick.jordan@oracle.com> |
---|---|
date | Tue, 06 Aug 2013 10:50:53 -0700 |
parents | 7244c8366d44 |
children | 038a598da996 |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java |
diffstat | 1 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Tue Aug 06 17:30:47 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java Tue Aug 06 10:50:53 2013 -0700 @@ -22,8 +22,11 @@ */ package com.oracle.graal.nodes.java; +import java.util.*; + import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; +import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.extended.*; import com.oracle.graal.nodes.spi.*; @@ -67,7 +70,22 @@ } LoadExceptionObjectNode loadException = graph().add(new LoadExceptionObjectNode(stamp())); loadException.setStateAfter(stateAfter()); + List<GuardedNode> guardedNodes = new ArrayList<>(); + for (Node usage : usages().snapshot()) { + if (usage instanceof GuardedNode) { + // can't replace the guard with LoadExceptionObjectNode as it is not a GuardingNode + // so temporarily change it to remove the GuardedNode from usages + GuardedNode guardedNode = (GuardedNode) usage; + guardedNode.setGuard(graph().add(new BeginNode())); + guardedNodes.add(guardedNode); + } + } replaceAtUsages(loadException); + for (GuardedNode guardedNode : guardedNodes) { + BeginNode dummyGuard = (BeginNode) guardedNode.getGuard(); + guardedNode.setGuard(this); + graph().removeFixed(dummyGuard); + } graph().addAfterFixed(this, loadException); setStateAfter(null); setStamp(StampFactory.forVoid());