# HG changeset patch # User Christos Kotselidis # Date 1375791061 -7200 # Node ID 9f647712f984fd469340245a9300062a461a11be # Parent a7b2dc8e05a09f5798939aee637c041d9712450f Nullify deopt state of writenodes with G1 pre barriers diff -r a7b2dc8e05a0 -r 9f647712f984 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Tue Aug 06 14:00:49 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierAdditionPhase.java Tue Aug 06 14:11:01 2013 +0200 @@ -71,6 +71,7 @@ G1PreWriteBarrier preBarrier = graph.add(new G1PreWriteBarrier(node.object(), null, node.location(), true, node.getNullCheck())); preBarrier.setDeoptimizationState(node.getDeoptimizationState()); node.setNullCheck(false); + node.setDeoptimizationState(null); graph.addBeforeFixed(node, preBarrier); } graph.addAfterFixed(node, graph.add(new G1PostWriteBarrier(node.object(), node.value(), node.location(), true))); @@ -82,6 +83,7 @@ G1PreWriteBarrier preBarrier = graph.add(new G1PreWriteBarrier(node.object(), null, node.location(), true, node.getNullCheck())); preBarrier.setDeoptimizationState(node.getDeoptimizationState()); node.setNullCheck(false); + node.setDeoptimizationState(null); graph.addBeforeFixed(node, preBarrier); graph.addAfterFixed(node, graph.add(new G1PostWriteBarrier(node.object(), node.value(), node.location(), false))); } else {