Mercurial > hg > truffle
changeset 16957:27b40d2f8f8a
relaxed access control from package to protected for elements that need to be accessed in generated subclasses in disjoint packages
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractFixedGuardNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -32,7 +32,7 @@ @NodeInfo public abstract class AbstractFixedGuardNode extends DeoptimizingFixedWithNextNode implements Simplifiable, GuardingNode { - @Input(InputType.Condition) LogicNode condition; + @Input(InputType.Condition) protected LogicNode condition; private final DeoptimizationReason reason; private final DeoptimizationAction action; private boolean negated;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingAnchoredNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FloatingAnchoredNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -30,7 +30,7 @@ @NodeInfo public abstract class FloatingAnchoredNode extends FloatingNode { - @Input(InputType.Anchor) AnchoringNode anchor; + @Input(InputType.Anchor) protected AnchoringNode anchor; public FloatingAnchoredNode(Stamp stamp) { super(stamp);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -44,7 +44,7 @@ @NodeInfo(nameTemplate = "Guard(!={p#negated}) {p#reason/s}", allowedUsageTypes = {InputType.Guard}) public class GuardNode extends FloatingAnchoredNode implements Canonicalizable, IterableNodeType, GuardingNode { - @Input(InputType.Condition) LogicNode condition; + @Input(InputType.Condition) protected LogicNode condition; private final DeoptimizationReason reason; private Constant speculation; private DeoptimizationAction action;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -47,10 +47,10 @@ return USE_GENERATED_NODES ? MergeNodeGen.class : MergeNode.class; } - MergeNode() { + protected MergeNode() { } - @Input(InputType.Association) NodeInputList<AbstractEndNode> ends = new NodeInputList<>(this); + @Input(InputType.Association) protected NodeInputList<AbstractEndNode> ends = new NodeInputList<>(this); @Override public void generate(NodeLIRBuilderTool gen) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -39,7 +39,7 @@ @NodeInfo public abstract class PhiNode extends FloatingNode implements Simplifiable { - @Input(InputType.Association) MergeNode merge; + @Input(InputType.Association) protected MergeNode merge; protected PhiNode(Stamp stamp, MergeNode merge) { super(stamp);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -33,7 +33,7 @@ @NodeInfo(nameTemplate = "ValuePhi({i#values})") public class ValuePhiNode extends PhiNode { - @Input NodeInputList<ValueNode> values; + @Input protected NodeInputList<ValueNode> values; /** * Create a value phi with the specified stamp.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewArrayNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AbstractNewArrayNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -34,7 +34,7 @@ @NodeInfo public class AbstractNewArrayNode extends AbstractNewObjectNode implements ArrayLengthProvider { - @Input ValueNode length; + @Input protected ValueNode length; @Override public ValueNode length() {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -42,7 +42,7 @@ return USE_GENERATED_NODES ? new MonitorIdNodeGen(lockDepth) : new MonitorIdNode(lockDepth); } - MonitorIdNode(int lockDepth) { + protected MonitorIdNode(int lockDepth) { super(StampFactory.forVoid()); this.lockDepth = lockDepth; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Tue Aug 26 23:40:08 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java Tue Aug 26 23:44:31 2014 +0200 @@ -51,7 +51,7 @@ return USE_GENERATED_NODES ? new NewArrayNodeGen(elementType, length, fillContents) : new NewArrayNode(elementType, length, fillContents); } - NewArrayNode(ResolvedJavaType elementType, ValueNode length, boolean fillContents) { + protected NewArrayNode(ResolvedJavaType elementType, ValueNode length, boolean fillContents) { super(StampFactory.exactNonNull(elementType.getArrayClass()), length, fillContents); }