Mercurial > hg > graal-compiler
changeset 9715:badabdca0c53
fix final-ness of @Input node inputs
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Wed May 15 10:43:03 2013 +0200 @@ -912,12 +912,12 @@ @Override public void visitBreakpointNode(BreakpointNode node) { - JavaType[] sig = new JavaType[node.arguments.size()]; + JavaType[] sig = new JavaType[node.arguments().size()]; for (int i = 0; i < sig.length; i++) { - sig[i] = node.arguments.get(i).stamp().javaType(runtime); + sig[i] = node.arguments().get(i).stamp().javaType(runtime); } - Value[] parameters = visitInvokeArguments(frameMap.registerConfig.getCallingConvention(CallingConvention.Type.JavaCall, null, sig, target(), false), node.arguments); + Value[] parameters = visitInvokeArguments(frameMap.registerConfig.getCallingConvention(CallingConvention.Type.JavaCall, null, sig, target(), false), node.arguments()); append(new AMD64BreakpointOp(parameters)); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CRuntimeCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CRuntimeCall.java Wed May 15 10:43:03 2013 +0200 @@ -37,7 +37,7 @@ */ public class CRuntimeCall extends DeoptimizingFixedWithNextNode implements LIRGenLowerable { - @Input protected final NodeInputList<ValueNode> arguments; + @Input private final NodeInputList<ValueNode> arguments; private final Descriptor descriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotNmethodExecuteNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotNmethodExecuteNode.java Wed May 15 10:43:03 2013 +0200 @@ -38,7 +38,7 @@ public class HotSpotNmethodExecuteNode extends AbstractCallNode implements Lowerable { - @Input private final ValueNode code; + @Input private ValueNode code; private final Class[] signature; public HotSpotNmethodExecuteNode(Kind kind, Class[] signature, ValueNode code, ValueNode arg1, ValueNode arg2, ValueNode arg3) { @@ -92,7 +92,7 @@ LoadFieldNode loadmetaspaceMethod = graph().add(new LoadFieldNode(loadMethod, metaspaceMethodField)); HotSpotIndirectCallTargetNode callTarget = graph().add( - new HotSpotIndirectCallTargetNode(loadmetaspaceMethod, load, arguments, stamp(), signatureTypes, method, CallingConvention.Type.JavaCall)); + new HotSpotIndirectCallTargetNode(loadmetaspaceMethod, load, arguments(), stamp(), signatureTypes, method, CallingConvention.Type.JavaCall)); InvokeNode invoke = graph().add(new InvokeNode(callTarget, 0));
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorEnterStubCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorEnterStubCall.java Wed May 15 10:43:03 2013 +0200 @@ -35,8 +35,8 @@ */ public class MonitorEnterStubCall extends DeoptimizingStubCall implements LIRGenLowerable { - @Input private final ValueNode object; - @Input private final ValueNode lock; + @Input private ValueNode object; + @Input private ValueNode lock; public static final Descriptor MONITORENTER = new Descriptor("monitorenter", true, void.class, Object.class, Word.class); public MonitorEnterStubCall(ValueNode object, ValueNode lock) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorExitStubCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorExitStubCall.java Wed May 15 10:43:03 2013 +0200 @@ -36,7 +36,7 @@ */ public class MonitorExitStubCall extends DeoptimizingStubCall implements LIRGenLowerable { - @Input private final ValueNode object; + @Input private ValueNode object; private int lockDepth; public static final Descriptor MONITOREXIT = new Descriptor("monitorexit", true, void.class, Object.class, Word.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java Wed May 15 10:43:03 2013 +0200 @@ -40,8 +40,8 @@ private static final Stamp defaultStamp = StampFactory.objectNonNull(); - @Input private final ValueNode hub; - @Input private final ValueNode length; + @Input private ValueNode hub; + @Input private ValueNode length; public static final Descriptor NEW_ARRAY = new Descriptor("new_array", false, Object.class, Word.class, int.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Wed May 15 10:43:03 2013 +0200 @@ -40,7 +40,7 @@ private static final Stamp defaultStamp = StampFactory.objectNonNull(); - @Input private final ValueNode hub; + @Input private ValueNode hub; public static final Descriptor NEW_INSTANCE = new Descriptor("new_instance", false, Object.class, Word.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Wed May 15 10:43:03 2013 +0200 @@ -41,8 +41,8 @@ private static final Stamp defaultStamp = StampFactory.objectNonNull(); - @Input private final ValueNode hub; - @Input private final ValueNode dims; + @Input private ValueNode hub; + @Input private ValueNode dims; private final int rank; public static final Descriptor NEW_MULTI_ARRAY = new Descriptor("new_multi_array", false, Object.class, Word.class, int.class, Word.class);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Wed May 15 10:43:03 2013 +0200 @@ -42,8 +42,8 @@ */ public class TailcallNode extends FixedWithNextNode implements LIRLowerable { - @Input private final FrameState frameState; - @Input private final ValueNode target; + @Input private FrameState frameState; + @Input private ValueNode target; /** * Creates a TailcallNode.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ThreadIsInterruptedStubCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ThreadIsInterruptedStubCall.java Wed May 15 10:43:03 2013 +0200 @@ -40,8 +40,8 @@ */ public class ThreadIsInterruptedStubCall extends DeoptimizingStubCall implements LIRGenLowerable { - @Input private final ValueNode thread; - @Input private final ValueNode clearIsInterrupted; + @Input private ValueNode thread; + @Input private ValueNode clearIsInterrupted; public static final Descriptor THREAD_IS_INTERRUPTED = new Descriptor("thread_is_interrupted", false, boolean.class, Object.class, boolean.class); public ThreadIsInterruptedStubCall(ValueNode thread, ValueNode clearIsInterrupted) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VerifyOopStubCall.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VerifyOopStubCall.java Wed May 15 10:43:03 2013 +0200 @@ -35,7 +35,7 @@ */ public class VerifyOopStubCall extends DeoptimizingStubCall implements LIRGenLowerable { - @Input private final ValueNode object; + @Input private ValueNode object; public static final Descriptor VERIFY_OOP = new Descriptor("verify_oop", false, Object.class, Object.class); public VerifyOopStubCall(ValueNode object) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java Wed May 15 10:43:03 2013 +0200 @@ -81,9 +81,9 @@ abstract static class CryptBlockStubCall extends DeoptimizingStubCall implements LIRGenLowerable { - @Input private final ValueNode in; - @Input private final ValueNode out; - @Input private final ValueNode key; + @Input private ValueNode in; + @Input private ValueNode out; + @Input private ValueNode key; private final Descriptor descriptor;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AbstractMethodHandleNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AbstractMethodHandleNode.java Wed May 15 10:43:03 2013 +0200 @@ -60,7 +60,7 @@ // Replacement method data private ResolvedJavaMethod replacementTargetMethod; private JavaType replacementReturnType; - @Input private NodeInputList<ValueNode> replacementArguments; + @Input private final NodeInputList<ValueNode> replacementArguments; /** * Search for an instance field with the given name in a class.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CipherBlockChainingSubstitutions.java Wed May 15 10:43:03 2013 +0200 @@ -98,11 +98,11 @@ abstract static class AESCryptStubCall extends DeoptimizingStubCall implements LIRGenLowerable { - @Input private final ValueNode in; - @Input private final ValueNode out; - @Input private final ValueNode key; - @Input private final ValueNode r; - @Input private final ValueNode inLength; + @Input private ValueNode in; + @Input private ValueNode out; + @Input private ValueNode key; + @Input private ValueNode r; + @Input private ValueNode inLength; private final Descriptor descriptor;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Wed May 15 10:43:03 2013 +0200 @@ -46,7 +46,7 @@ */ public final class BreakpointNode extends FixedWithNextNode implements LIRLowerable { - @Input public final NodeInputList<ValueNode> arguments; + @Input private final NodeInputList<ValueNode> arguments; public BreakpointNode(ValueNode... arguments) { super(StampFactory.forVoid()); @@ -57,4 +57,8 @@ public void generate(LIRGeneratorTool gen) { gen.visitBreakpointNode(this); } + + public NodeInputList<ValueNode> arguments() { + return arguments; + } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Wed May 15 10:43:03 2013 +0200 @@ -30,7 +30,7 @@ public abstract class CallTargetNode extends ValueNode implements LIRLowerable { - @Input protected final NodeInputList<ValueNode> arguments; + @Input private final NodeInputList<ValueNode> arguments; public CallTargetNode(ValueNode[] arguments) { super(StampFactory.extension());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IndirectCallTargetNode.java Wed May 15 10:43:03 2013 +0200 @@ -30,7 +30,7 @@ public class IndirectCallTargetNode extends LoweredCallTargetNode { - @Input protected ValueNode computedAddress; + @Input private ValueNode computedAddress; public IndirectCallTargetNode(ValueNode computedAddress, List<ValueNode> arguments, Stamp returnStamp, JavaType[] signature, ResolvedJavaMethod target, CallingConvention.Type callType) { super(arguments, returnStamp, signature, target, callType);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed May 15 10:43:03 2013 +0200 @@ -37,7 +37,7 @@ @NodeInfo(nameTemplate = "Invoke#{p#targetMethod/s}") public final class InvokeNode extends AbstractStateSplit implements StateSplit, Node.IterableNodeType, Invoke, LIRLowerable, MemoryCheckpoint { - @Input private final CallTargetNode callTarget; + @Input private CallTargetNode callTarget; @Input private FrameState deoptState; @Input private GuardingNode guard; private final int bci;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed May 15 10:43:03 2013 +0200 @@ -37,7 +37,7 @@ @Successor private AbstractBeginNode next; @Successor private DispatchBeginNode exceptionEdge; - @Input private final CallTargetNode callTarget; + @Input private CallTargetNode callTarget; @Input private FrameState deoptState; @Input private FrameState stateAfter; @Input private GuardingNode guard;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractCallNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractCallNode.java Wed May 15 10:43:03 2013 +0200 @@ -28,7 +28,7 @@ public abstract class AbstractCallNode extends AbstractStateSplit implements StateSplit, MemoryCheckpoint { - @Input protected final NodeInputList<ValueNode> arguments; + @Input private final NodeInputList<ValueNode> arguments; public AbstractCallNode(Stamp stamp, ValueNode[] arguments) { super(stamp);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Wed May 15 10:43:03 2013 +0200 @@ -29,7 +29,7 @@ public class NullCheckNode extends DeoptimizingFixedWithNextNode implements LIRLowerable, GuardingNode { - @Input public ValueNode object; + @Input private ValueNode object; public NullCheckNode(ValueNode object) { super(StampFactory.dependency());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Wed May 15 10:43:03 2013 +0200 @@ -34,7 +34,7 @@ */ public abstract class SwitchNode extends ControlSplitNode { - @Successor protected final NodeSuccessorList<AbstractBeginNode> successors; + @Successor private final NodeSuccessorList<AbstractBeginNode> successors; @Input private ValueNode value; private double[] keyProbabilities; private int[] keySuccessors;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed May 15 09:03:43 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed May 15 10:43:03 2013 +0200 @@ -36,7 +36,7 @@ */ public final class ValueAnchorNode extends FixedWithNextNode implements Canonicalizable, LIRLowerable, Node.IterableNodeType, Virtualizable, GuardingNode { - @Input private NodeInputList<ValueNode> anchored; + @Input private final NodeInputList<ValueNode> anchored; public ValueAnchorNode(ValueNode... values) { this(false, values);