Mercurial > hg > graal-compiler
changeset 5299:0ebd9cfdc11f
removed @Data annotation
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Apr 25 13:02:10 2012 +0200 @@ -29,7 +29,6 @@ import com.oracle.graal.alloc.simple.*; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.gen.*; -import com.oracle.graal.compiler.graph.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.compiler.schedule.*;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Wed Apr 25 13:02:10 2012 +0200 @@ -26,10 +26,7 @@ import java.util.*; import java.util.concurrent.*; -import com.oracle.max.cri.ci.*; -import com.oracle.max.cri.ri.*; import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.graph.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.compiler.util.*; import com.oracle.graal.compiler.util.InliningUtil.InlineInfo; @@ -39,6 +36,8 @@ import com.oracle.graal.debug.internal.*; import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; +import com.oracle.max.cri.ci.*; +import com.oracle.max.cri.ri.*; public class InliningPhase extends Phase implements InliningCallback {
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Wed Apr 25 13:02:10 2012 +0200 @@ -63,10 +63,6 @@ @Target(ElementType.FIELD) public static @interface Successor {} - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - public static @interface Data {} - /** * Denotes that a parameter of an {@linkplain NodeIntrinsic intrinsic} method * must be a compile time constant at all call sites to the intrinic method.
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java Wed Apr 25 13:02:10 2012 +0200 @@ -27,8 +27,6 @@ import java.util.Map.*; import java.util.concurrent.ConcurrentHashMap; -import com.oracle.graal.graph.Node.Data; - import sun.misc.Unsafe; public class NodeClass { @@ -273,15 +271,13 @@ successorTypesMap.put(offset, type); } successorNamesMap.put(offset, name); - } else if (field.isAnnotationPresent(Node.Data.class)) { - assert !Node.class.isAssignableFrom(field.getType()) : "cannot have a node as data: " + currentClazz; - dataOffsets.add(offset); - dataTypes.add(type); - dataNames.add(name); } else { assert !NODE_CLASS.isAssignableFrom(type) || name.equals("Null") : "suspicious node field: " + field; assert !INPUT_LIST_CLASS.isAssignableFrom(type) : "suspicious node input list field: " + field; assert !SUCCESSOR_LIST_CLASS.isAssignableFrom(type) : "suspicious node successor list field: " + field; + dataOffsets.add(offset); + dataTypes.add(type); + dataNames.add(name); } } }
--- a/graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TestNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.graph/test/com/oracle/graal/graph/test/TestNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -26,7 +26,7 @@ public class TestNode extends Node implements Node.IterableNodeType { - @Data private String name; + private String name; public TestNode(String name) { this.name = name;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Wed Apr 25 13:02:10 2012 +0200 @@ -28,7 +28,6 @@ import java.util.*; import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.graph.*; import com.oracle.graal.compiler.phases.*; import com.oracle.graal.compiler.phases.PhasePlan.PhasePosition; import com.oracle.graal.compiler.target.*;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java Wed Apr 25 13:02:10 2012 +0200 @@ -400,7 +400,7 @@ @Input private ValueNode object; @Input private ValueNode value; @Input private ValueNode offset; - @Data private final int displacement; + private final int displacement; public DirectObjectStoreNode(ValueNode object, int displacement, ValueNode offset, ValueNode value) { super(StampFactory.illegal());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -36,7 +36,7 @@ @NodeInfo(shortName = "Const") public class ConstantNode extends BooleanNode implements LIRLowerable { - @Data public final CiConstant value; + public final CiConstant value; protected ConstantNode(CiConstant value) { super(StampFactory.forConstant(value));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ControlSplitNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -46,7 +46,7 @@ return blockSuccessors.size(); } - @Data protected final double[] branchProbability; + protected final double[] branchProbability; public ControlSplitNode(Stamp stamp, BeginNode[] blockSuccessors, double[] branchProbability) { super(stamp);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -30,9 +30,9 @@ @NodeInfo(shortName = "Deopt") public class DeoptimizeNode extends FixedNode implements Node.IterableNodeType, LIRLowerable { - @Data private String message; - @Data private final RiDeoptAction action; - @Data private final RiDeoptReason reason; + private String message; + private final RiDeoptAction action; + private final RiDeoptReason reason; private final long leafGraphId;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedGuardNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -31,8 +31,8 @@ public final class FixedGuardNode extends FixedWithNextNode implements Simplifiable, Lowerable, LIRLowerable, Node.IterableNodeType { @Input private final NodeInputList<BooleanNode> conditions; - @Data private final RiDeoptReason deoptReason; - @Data private final RiDeoptAction action; + private final RiDeoptReason deoptReason; + private final RiDeoptAction action; private final long leafGraphId; public FixedGuardNode(BooleanNode condition, RiDeoptReason deoptReason, RiDeoptAction action, long leafGraphId) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FixedNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -26,7 +26,7 @@ public abstract class FixedNode extends ValueNode { - @Data private double probability; + private double probability; public FixedNode(Stamp stamp) { super(stamp);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -33,8 +33,8 @@ @Input private BooleanNode condition; @Input(notDataflow = true) private FixedNode anchor; - @Data private final RiDeoptReason reason; - @Data private final RiDeoptAction action; + private final RiDeoptReason reason; + private final RiDeoptAction action; private final long leafGraphId; public FixedNode anchor() {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -37,9 +37,9 @@ public final class InvokeNode extends AbstractStateSplit implements Node.IterableNodeType, Invoke, LIRLowerable, MemoryCheckpoint { @Input private final MethodCallTargetNode callTarget; - @Data private final int bci; + private final int bci; // megamorph should only be true when the compiler is sure that the call site is megamorph, and false when in doubt - @Data private boolean megamorph; + private boolean megamorph; private boolean useForInlining; private final long leafGraphId;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -37,9 +37,9 @@ @Input private final MethodCallTargetNode callTarget; @Input private FrameState stateAfter; - @Data private final int bci; + private final int bci; // megamorph should only be true when the compiler is sure that the call site is megamorph, and false when in doubt - @Data private boolean megamorph; + private boolean megamorph; private boolean useForInlining; private final long leafGraphId;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LocalNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LocalNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -34,7 +34,7 @@ public final class LocalNode extends FloatingNode implements Node.IterableNodeType { - @Data private final int index; + private final int index; public LocalNode(CiKind kind, int index) { this(index, StampFactory.forKind(kind));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -31,8 +31,8 @@ public final class LoopEndNode extends EndNode { @Input(notDataflow = true) private LoopBeginNode loopBegin; - @Data private boolean canSafepoint; - @Data private int endIndex; + private boolean canSafepoint; + private int endIndex; public LoopEndNode(LoopBeginNode begin) { int idx = begin.nextEndIndex();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -41,7 +41,7 @@ @Input(notDataflow = true) private MergeNode merge; @Input private final NodeInputList<ValueNode> values = new NodeInputList<>(this); - @Data private final PhiType type; + private final PhiType type; public PhiNode(CiKind kind, MergeNode merge, PhiType type) { super(StampFactory.forKind(kind));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -39,7 +39,7 @@ * The kind of this value. This is {@link CiKind#Void} for instructions that produce no value. * This kind is guaranteed to be a {@linkplain CiKind#stackKind() stack kind}. */ - @Data private Stamp stamp; + private Stamp stamp; @Input private NodeInputList<Node> dependencies;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueProxyNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -32,7 +32,7 @@ public class ValueProxyNode extends FloatingNode implements Node.IterableNodeType, ValueNumberable { @Input(notDataflow = true) private BeginNode proxyPoint; @Input private ValueNode value; - @Data private final PhiType type; + private final PhiType type; public ValueProxyNode(ValueNode value, BeginNode exit, PhiType type) { super(value.stamp());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ArithmeticNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -30,7 +30,7 @@ */ public abstract class ArithmeticNode extends BinaryNode { - @Data private final boolean isStrictFP; + private final boolean isStrictFP; /** * Creates a new arithmetic operation.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -40,8 +40,8 @@ @Input private ValueNode x; @Input private ValueNode y; - @Data private final Condition condition; - @Data private final boolean unorderedIsTrue; + private final Condition condition; + private final boolean unorderedIsTrue; public ValueNode x() { return x;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -66,7 +66,7 @@ @Input private ValueNode value; - @Data public final Op opcode; + public final Op opcode; public ValueNode value() { return value;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NormalizeCompareNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -31,7 +31,7 @@ * Returns -1, 0, or 1 if either x < y, x == y, or x > y. */ public final class NormalizeCompareNode extends BinaryNode implements Lowerable { - @Data public final boolean isUnorderedLess; + public final boolean isUnorderedLess; /** * Creates a new compare operation.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NullCheckNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -31,7 +31,7 @@ public final class NullCheckNode extends BooleanNode implements Canonicalizable, LIRLowerable, ConditionalTypeFeedbackProvider, TypeCanonicalizable { @Input private ValueNode object; - @Data public final boolean expectedNull; + public final boolean expectedNull; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AccessNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -30,7 +30,7 @@ @Input private ValueNode object; @Input private GuardNode guard; @Input private LocationNode location; - @Data private boolean nullCheck; + private boolean nullCheck; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -34,8 +34,8 @@ public final class BoxNode extends AbstractStateSplit implements Node.IterableNodeType { @Input private ValueNode source; - @Data private int bci; - @Data private CiKind sourceKind; + private int bci; + private CiKind sourceKind; public BoxNode(ValueNode value, RiResolvedType type, CiKind sourceKind, int bci) { super(StampFactory.exactNonNull(type));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingAccessNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -32,7 +32,7 @@ @Input private ValueNode object; @Input private GuardNode guard; @Input private LocationNode location; - @Data private boolean nullCheck; + private boolean nullCheck; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -29,7 +29,7 @@ public final class IndexedLocationNode extends LocationNode implements LIRLowerable, Canonicalizable { @Input private ValueNode index; - @Data private boolean indexScalingEnabled; + private boolean indexScalingEnabled; public ValueNode index() { return index;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -31,9 +31,9 @@ public class LocationNode extends FloatingNode implements LIRLowerable, ValueNumberable { - @Data private int displacement; - @Data private CiKind valueKind; - @Data private Object locationIdentity; + private int displacement; + private CiKind valueKind; + private Object locationIdentity; public static final Object ANY_LOCATION = new Object() { @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LookupSwitchNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LookupSwitchNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -31,7 +31,7 @@ */ public final class LookupSwitchNode extends SwitchNode implements LIRLowerable, Simplifiable { - @Data private final int[] keys; + private final int[] keys; /** * Constructs a new LookupSwitch instruction.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/RuntimeCallNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/RuntimeCallNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -29,7 +29,7 @@ public final class RuntimeCallNode extends AbstractCallNode implements LIRLowerable { - @Data private final CiRuntimeCall call; + private final CiRuntimeCall call; public CiRuntimeCall call() { return call;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/TableSwitchNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/TableSwitchNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -30,7 +30,7 @@ */ public final class TableSwitchNode extends SwitchNode implements LIRLowerable, Simplifiable { - @Data private final int lowKey; + private final int lowKey; /** * Constructs a new TableSwitch instruction.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnboxNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -34,7 +34,7 @@ public final class UnboxNode extends FixedWithNextNode implements Node.IterableNodeType, Canonicalizable { @Input private ValueNode source; - @Data private CiKind destinationKind; + private CiKind destinationKind; public UnboxNode(CiKind kind, ValueNode source) { super(StampFactory.forKind(kind));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -35,7 +35,7 @@ public final class UnsafeCastNode extends FloatingNode implements Canonicalizable, Lowerable { @Input private ValueNode object; - @Data private RiResolvedType toType; + private RiResolvedType toType; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -35,8 +35,8 @@ @Input private ValueNode object; @Input private ValueNode offset; - @Data private final int displacement; - @Data private final CiKind loadKind; + private final int displacement; + private final CiKind loadKind; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -36,8 +36,8 @@ @Input private ValueNode object; @Input private ValueNode offset; @Input private ValueNode value; - @Data private final int displacement; - @Data private final CiKind storeKind; + private final int displacement; + private final CiKind storeKind; public UnsafeStoreNode(ValueNode object, int displacement, ValueNode offset, ValueNode value, CiKind kind) { super(StampFactory.illegal());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessFieldNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -39,7 +39,7 @@ @Input private ValueNode object; - @Data protected final RiResolvedField field; + protected final RiResolvedField field; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -36,7 +36,7 @@ @Input private ValueNode index; @Input private ValueNode length; - @Data private final CiKind elementType; + private final CiKind elementType; private final long leafGraphId; public ValueNode index() {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessMonitorNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -46,7 +46,7 @@ public abstract class AccessMonitorNode extends AbstractStateSplit implements MemoryCheckpoint { @Input private ValueNode object; - @Data private boolean eliminated; + private boolean eliminated; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CheckCastNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -40,7 +40,7 @@ public final class CheckCastNode extends TypeCheckNode implements Canonicalizable, LIRLowerable, Node.IterableNodeType, TypeFeedbackProvider, TypeCanonicalizable { @Input(notDataflow = true) protected final FixedNode anchor; - @Data protected final boolean emitCode; + protected final boolean emitCode; public FixedNode anchor() { return anchor;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -39,7 +39,7 @@ @Input private ValueNode offset; @Input private ValueNode expected; @Input private ValueNode newValue; - @Data private final int displacement; + private final int displacement; public ValueNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -35,7 +35,7 @@ */ public final class InstanceOfNode extends TypeCheckNode implements Canonicalizable, LIRLowerable, ConditionalTypeFeedbackProvider, TypeCanonicalizable { - @Data private final boolean negated; + private final boolean negated; public boolean negated() { return negated;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/IsTypeNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -34,7 +34,7 @@ public final class IsTypeNode extends BooleanNode implements Canonicalizable, LIRLowerable { @Input private ValueNode objectClass; - @Data private final RiResolvedType type; + private final RiResolvedType type; public ValueNode objectClass() { return objectClass;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -37,9 +37,9 @@ Virtual } - @Data private final RiType returnType; - @Data private RiResolvedMethod targetMethod; - @Data private InvokeKind invokeKind; + private final RiType returnType; + private RiResolvedMethod targetMethod; + private InvokeKind invokeKind; /** * @param arguments
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -36,7 +36,7 @@ */ public final class NewInstanceNode extends FixedWithNextNode implements EscapeAnalyzable, LIRLowerable, Node.IterableNodeType { - @Data private final RiResolvedType instanceClass; + private final RiResolvedType instanceClass; /** * Constructs a NewInstanceNode.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewMultiArrayNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -38,7 +38,7 @@ public final class NewMultiArrayNode extends FixedWithNextNode implements LIRLowerable, TypeFeedbackProvider { @Input private final NodeInputList<ValueNode> dimensions; - @Data private final RiResolvedType type; + private final RiResolvedType type; public ValueNode dimension(int index) { return dimensions.get(index);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewObjectArrayNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewObjectArrayNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -33,7 +33,7 @@ */ public final class NewObjectArrayNode extends NewArrayNode implements LIRLowerable, Node.IterableNodeType { - @Data private final RiResolvedType elementClass; + private final RiResolvedType elementClass; /** * Constructs a new NewObjectArrayNode.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewTypeArrayNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewTypeArrayNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -32,7 +32,7 @@ */ public final class NewTypeArrayNode extends NewArrayNode implements LIRLowerable { - @Data private final RiResolvedType elementType; + private final RiResolvedType elementType; public NewTypeArrayNode(ValueNode length, RiResolvedType elementType) { super(StampFactory.exactNonNull(elementType.arrayOf()), length);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeCheckNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -34,9 +34,9 @@ protected static final RiResolvedType[] EMPTY_HINTS = new RiResolvedType[0]; @Input private ValueNode object; @Input private ValueNode targetClassInstruction; - @Data private final RiResolvedType targetClass; - @Data private final RiResolvedType[] hints; - @Data private final boolean hintsExact; + private final RiResolvedType targetClass; + private final RiResolvedType[] hints; + private final boolean hintsExact; /** * Creates a new TypeCheckNode.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectFieldNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectFieldNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -34,7 +34,7 @@ @Input private ValueNode lastState; @Input private ValueNode input; - @Data private int index; + private int index; public VirtualObjectNode object() { return object;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -30,9 +30,9 @@ public class VirtualObjectNode extends ValueNode implements LIRLowerable { - @Data private RiResolvedType type; - @Data private EscapeField[] fields; - @Data private int fieldsCount; + private RiResolvedType type; + private EscapeField[] fields; + private int fieldsCount; public VirtualObjectNode(RiResolvedType type, EscapeField[] fields) { super(StampFactory.illegal());
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java Wed Apr 25 12:15:42 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java Wed Apr 25 13:02:10 2012 +0200 @@ -38,7 +38,7 @@ public class MathIntrinsicNode extends FloatingNode implements Canonicalizable, AMD64LIRLowerable { @Input private ValueNode x; - @Data private final Operation operation; + private final Operation operation; public enum Operation { ABS, SQRT, LOG, LOG10, SIN, COS, TAN,