# HG changeset patch # User Thomas Wuerthinger # Date 1399342440 -7200 # Node ID a51d48ac96d3a81fe48f3e01d5cc64b92dc8c528 # Parent c5ce68561b7528759c943e79ac6e06ad6a9d2ee9 Fix bug in CanonicalizerPhase that could remove fixed nodes with side effects in a corner case. diff -r c5ce68561b75 -r a51d48ac96d3 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Tue May 06 04:07:30 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java Tue May 06 04:14:00 2014 +0200 @@ -185,7 +185,8 @@ boolean improvedStamp = tryInferStamp(valueNode); Constant constant = valueNode.stamp().asConstant(); if (constant != null && !(node instanceof ConstantNode)) { - performReplacement(valueNode, ConstantNode.forConstant(valueNode.stamp(), constant, context.getMetaAccess(), valueNode.graph())); + valueNode.replaceAtUsages(ConstantNode.forConstant(valueNode.stamp(), constant, context.getMetaAccess(), valueNode.graph())); + GraphUtil.tryKillUnused(valueNode); } else if (improvedStamp) { // the improved stamp may enable additional canonicalization tryCanonicalize(valueNode, nodeClass);