Mercurial > hg > graal-compiler
changeset 21995:922a0438914b
Introduce common superclass for all write barriers.
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayRangeWriteBarrier.java Wed Jun 17 14:24:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ArrayRangeWriteBarrier.java Wed Jun 17 15:42:27 2015 +0200 @@ -22,14 +22,13 @@ */ package com.oracle.graal.hotspot.nodes; -import com.oracle.graal.compiler.common.type.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodeinfo.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.spi.*; @NodeInfo -public abstract class ArrayRangeWriteBarrier extends FixedWithNextNode implements Lowerable { +public abstract class ArrayRangeWriteBarrier extends WriteBarrier implements Lowerable { public static final NodeClass<ArrayRangeWriteBarrier> TYPE = NodeClass.create(ArrayRangeWriteBarrier.class); @Input ValueNode object; @@ -37,7 +36,7 @@ @Input ValueNode length; protected ArrayRangeWriteBarrier(NodeClass<? extends ArrayRangeWriteBarrier> c, ValueNode object, ValueNode startIndex, ValueNode length) { - super(c, StampFactory.forVoid()); + super(c); this.object = object; this.startIndex = startIndex; this.length = length; @@ -54,10 +53,4 @@ public ValueNode getLength() { return length; } - - @Override - public void lower(LoweringTool tool) { - assert graph().getGuardsStage().areFrameStatesAtDeopts(); - tool.getLowerer().lower(this, tool); - } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PostWriteBarrier.java Wed Jun 17 14:24:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PostWriteBarrier.java Wed Jun 17 15:42:27 2015 +0200 @@ -28,7 +28,7 @@ import com.oracle.graal.nodes.memory.address.*; @NodeInfo -public class G1PostWriteBarrier extends WriteBarrier { +public class G1PostWriteBarrier extends ObjectWriteBarrier { public static final NodeClass<G1PostWriteBarrier> TYPE = NodeClass.create(G1PostWriteBarrier.class); protected final boolean alwaysNull;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java Wed Jun 17 14:24:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java Wed Jun 17 15:42:27 2015 +0200 @@ -28,7 +28,7 @@ import com.oracle.graal.nodes.memory.address.*; @NodeInfo -public final class G1PreWriteBarrier extends WriteBarrier implements DeoptimizingNode.DeoptBefore { +public final class G1PreWriteBarrier extends ObjectWriteBarrier implements DeoptimizingNode.DeoptBefore { public static final NodeClass<G1PreWriteBarrier> TYPE = NodeClass.create(G1PreWriteBarrier.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ReferentFieldReadBarrier.java Wed Jun 17 14:24:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1ReferentFieldReadBarrier.java Wed Jun 17 15:42:27 2015 +0200 @@ -34,7 +34,7 @@ * read barrier and consequently is added to the SATB queue if the concurrent marker is enabled. */ @NodeInfo -public final class G1ReferentFieldReadBarrier extends WriteBarrier { +public final class G1ReferentFieldReadBarrier extends ObjectWriteBarrier { public static final NodeClass<G1ReferentFieldReadBarrier> TYPE = NodeClass.create(G1ReferentFieldReadBarrier.class); protected final boolean doLoad;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ObjectWriteBarrier.java Wed Jun 17 15:42:27 2015 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.hotspot.nodes; + +import com.oracle.graal.graph.*; +import com.oracle.graal.nodeinfo.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.memory.address.*; + +@NodeInfo +public abstract class ObjectWriteBarrier extends WriteBarrier { + + public static final NodeClass<ObjectWriteBarrier> TYPE = NodeClass.create(ObjectWriteBarrier.class); + @Input(InputType.Association) protected AddressNode address; + @OptionalInput protected ValueNode value; + protected final boolean precise; + + protected ObjectWriteBarrier(NodeClass<? extends ObjectWriteBarrier> c, AddressNode address, ValueNode value, boolean precise) { + super(c); + this.address = address; + this.value = value; + this.precise = precise; + } + + public ValueNode getValue() { + return value; + } + + public AddressNode getAddress() { + return address; + } + + public boolean usePrecise() { + return precise; + } +}
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialWriteBarrier.java Wed Jun 17 14:24:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/SerialWriteBarrier.java Wed Jun 17 15:42:27 2015 +0200 @@ -27,7 +27,7 @@ import com.oracle.graal.nodes.memory.address.*; @NodeInfo -public class SerialWriteBarrier extends WriteBarrier { +public class SerialWriteBarrier extends ObjectWriteBarrier { public static final NodeClass<SerialWriteBarrier> TYPE = NodeClass.create(SerialWriteBarrier.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Wed Jun 17 14:24:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/WriteBarrier.java Wed Jun 17 15:42:27 2015 +0200 @@ -26,34 +26,15 @@ import com.oracle.graal.graph.*; import com.oracle.graal.nodeinfo.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.memory.address.*; import com.oracle.graal.nodes.spi.*; @NodeInfo public abstract class WriteBarrier extends FixedWithNextNode implements Lowerable { public static final NodeClass<WriteBarrier> TYPE = NodeClass.create(WriteBarrier.class); - @Input(InputType.Association) protected AddressNode address; - @OptionalInput protected ValueNode value; - protected final boolean precise; - protected WriteBarrier(NodeClass<? extends WriteBarrier> c, AddressNode address, ValueNode value, boolean precise) { + protected WriteBarrier(NodeClass<? extends WriteBarrier> c) { super(c, StampFactory.forVoid()); - this.address = address; - this.value = value; - this.precise = precise; - } - - public ValueNode getValue() { - return value; - } - - public AddressNode getAddress() { - return address; - } - - public boolean usePrecise() { - return precise; } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierVerificationPhase.java Wed Jun 17 14:24:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/WriteBarrierVerificationPhase.java Wed Jun 17 15:42:27 2015 +0200 @@ -79,12 +79,12 @@ throw new AssertionError("Write barrier must be present " + write); } if (useG1GC()) { - if (!(currentNode instanceof G1PostWriteBarrier) || (!validateBarrier((FixedAccessNode) write, (WriteBarrier) currentNode))) { + if (!(currentNode instanceof G1PostWriteBarrier) || (!validateBarrier((FixedAccessNode) write, (ObjectWriteBarrier) currentNode))) { expandFrontier(frontier, currentNode); } } else { - if (!(currentNode instanceof SerialWriteBarrier) || (!validateBarrier((FixedAccessNode) write, (WriteBarrier) currentNode)) || - ((currentNode instanceof SerialWriteBarrier) && !validateBarrier((FixedAccessNode) write, (WriteBarrier) currentNode))) { + if (!(currentNode instanceof SerialWriteBarrier) || (!validateBarrier((FixedAccessNode) write, (ObjectWriteBarrier) currentNode)) || + ((currentNode instanceof SerialWriteBarrier) && !validateBarrier((FixedAccessNode) write, (ObjectWriteBarrier) currentNode))) { expandFrontier(frontier, currentNode); } } @@ -105,7 +105,7 @@ } private static boolean isObjectBarrier(FixedWithNextNode node, final Node next) { - return next instanceof WriteBarrier && validateBarrier((FixedAccessNode) node, (WriteBarrier) next); + return next instanceof ObjectWriteBarrier && validateBarrier((FixedAccessNode) node, (ObjectWriteBarrier) next); } private static boolean isArrayBarrier(FixedWithNextNode node, final Node next) { @@ -150,7 +150,7 @@ } } - private static boolean validateBarrier(FixedAccessNode write, WriteBarrier barrier) { + private static boolean validateBarrier(FixedAccessNode write, ObjectWriteBarrier barrier) { assert write instanceof WriteNode || write instanceof LoweredCompareAndSwapNode || write instanceof LoweredAtomicReadAndWriteNode : "Node must be of type requiring a write barrier " + write; if (!barrier.usePrecise()) { if (barrier.getAddress() instanceof OffsetAddressNode && write.getAddress() instanceof OffsetAddressNode) {