# HG changeset patch # User Josef Eisl # Date 1407855547 -7200 # Node ID dc9f55fbbf38fbc30460718d11154b265481b8fc # Parent 07110b72e04a5540c31eb569dd0bff9c7afbf6ee Restrict access to internal forEach* in LIRInstructionClass and friends. diff -r 07110b72e04a -r dc9f55fbbf38 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Tue Aug 12 16:09:18 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java Tue Aug 12 16:59:07 2014 +0200 @@ -54,11 +54,11 @@ valueClass = CompositeValueClass.get(getClass()); } - public final CompositeValue forEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueProcedureBase proc) { + final CompositeValue forEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueProcedureBase proc) { return valueClass.forEachComponent(inst, this, mode, proc); } - public final void forEachComponent(LIRInstruction inst, OperandMode mode, ValuePositionProcedure proc, ValuePosition outerPosition) { + final void forEachComponent(LIRInstruction inst, OperandMode mode, ValuePositionProcedure proc, ValuePosition outerPosition) { valueClass.forEachComponent(inst, this, mode, proc, outerPosition); } diff -r 07110b72e04a -r dc9f55fbbf38 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java Tue Aug 12 16:09:18 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java Tue Aug 12 16:59:07 2014 +0200 @@ -139,11 +139,11 @@ return str.toString(); } - public final CompositeValue forEachComponent(LIRInstruction inst, CompositeValue obj, OperandMode mode, InstructionValueProcedureBase proc) { + final CompositeValue forEachComponent(LIRInstruction inst, CompositeValue obj, OperandMode mode, InstructionValueProcedureBase proc) { return forEachComponent(inst, obj, directComponentCount, componentOffsets, mode, componentFlags, proc); } - public final void forEachComponent(LIRInstruction inst, CompositeValue obj, OperandMode mode, ValuePositionProcedure proc, ValuePosition outerPosition) { + final void forEachComponent(LIRInstruction inst, CompositeValue obj, OperandMode mode, ValuePositionProcedure proc, ValuePosition outerPosition) { forEach(inst, obj, directComponentCount, componentOffsets, mode, componentFlags, proc, outerPosition); } diff -r 07110b72e04a -r dc9f55fbbf38 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Tue Aug 12 16:09:18 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Tue Aug 12 16:59:07 2014 +0200 @@ -33,7 +33,7 @@ public class LIRInstructionClass extends LIRIntrospection { - public static final LIRInstructionClass get(Class c) { + static final LIRInstructionClass get(Class c) { LIRInstructionClass clazz = (LIRInstructionClass) allClasses.get(c); if (clazz != null) { return clazz; @@ -71,12 +71,12 @@ private String opcodeConstant; private long opcodeOffset; - public LIRInstructionClass(Class clazz) { + private LIRInstructionClass(Class clazz) { this(clazz, new DefaultCalcOffset()); } @SuppressWarnings("unchecked") - public LIRInstructionClass(Class clazz, CalcOffset calcOffset) { + private LIRInstructionClass(Class clazz, CalcOffset calcOffset) { super(clazz); assert INSTRUCTION_CLASS.isAssignableFrom(clazz); @@ -306,7 +306,7 @@ } } - public final String getOpcode(LIRInstruction obj) { + final String getOpcode(LIRInstruction obj) { if (opcodeConstant != null) { return opcodeConstant; } @@ -314,11 +314,11 @@ return unsafe.getObject(obj, opcodeOffset).toString(); } - public final boolean hasOperands() { + final boolean hasOperands() { return useOffsets.length > 0 || aliveOffsets.length > 0 || tempOffsets.length > 0 || defOffsets.length > 0; } - public final boolean hasState(LIRInstruction obj) { + final boolean hasState(LIRInstruction obj) { for (int i = 0; i < stateOffsets.length; i++) { if (getState(obj, stateOffsets[i]) != null) { return true; @@ -327,35 +327,35 @@ return false; } - public final void forEachUse(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachUse(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, directUseCount, useOffsets, OperandMode.USE, useFlags, proc, ValuePosition.ROOT_VALUE_POSITION); } - public final void forEachAlive(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachAlive(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, directAliveCount, aliveOffsets, OperandMode.ALIVE, aliveFlags, proc, ValuePosition.ROOT_VALUE_POSITION); } - public final void forEachTemp(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachTemp(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, directTempCount, tempOffsets, OperandMode.TEMP, tempFlags, proc, ValuePosition.ROOT_VALUE_POSITION); } - public final void forEachDef(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachDef(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, directDefCount, defOffsets, OperandMode.DEF, defFlags, proc, ValuePosition.ROOT_VALUE_POSITION); } - public final void forEachUse(LIRInstruction obj, InstructionValueProcedureBase proc) { + final void forEachUse(LIRInstruction obj, InstructionValueProcedureBase proc) { forEach(obj, directUseCount, useOffsets, OperandMode.USE, useFlags, proc); } - public final void forEachAlive(LIRInstruction obj, InstructionValueProcedureBase proc) { + final void forEachAlive(LIRInstruction obj, InstructionValueProcedureBase proc) { forEach(obj, directAliveCount, aliveOffsets, OperandMode.ALIVE, aliveFlags, proc); } - public final void forEachTemp(LIRInstruction obj, InstructionValueProcedureBase proc) { + final void forEachTemp(LIRInstruction obj, InstructionValueProcedureBase proc) { forEach(obj, directTempCount, tempOffsets, OperandMode.TEMP, tempFlags, proc); } - public final void forEachDef(LIRInstruction obj, InstructionValueProcedureBase proc) { + final void forEachDef(LIRInstruction obj, InstructionValueProcedureBase proc) { forEach(obj, directDefCount, defOffsets, OperandMode.DEF, defFlags, proc); } @@ -368,7 +368,7 @@ } } - public final void forEachState(LIRInstruction obj, InstructionStateProcedure proc) { + final void forEachState(LIRInstruction obj, InstructionStateProcedure proc) { for (int i = 0; i < stateOffsets.length; i++) { LIRFrameState state = getState(obj, stateOffsets[i]); if (state != null) { @@ -377,7 +377,7 @@ } } - public final Value forEachRegisterHint(LIRInstruction obj, OperandMode mode, InstructionValueProcedure proc) { + final Value forEachRegisterHint(LIRInstruction obj, OperandMode mode, InstructionValueProcedure proc) { int hintDirectCount = 0; long[] hintOffsets = null; if (mode == OperandMode.USE) { @@ -415,7 +415,7 @@ return (LIRFrameState) unsafe.getObject(obj, offset); } - public String toString(LIRInstruction obj) { + String toString(LIRInstruction obj) { StringBuilder result = new StringBuilder(); appendValues(result, obj, "", " = ", "(", ")", new String[]{""}, defOffsets);