# HG changeset patch # User Josef Eisl # Date 1411646555 -7200 # Node ID 0acefec7231ad1807a2b758e1cc7db70c3f81323 # Parent b8516934a9e5c6bd72951a0c6f07d13693616237 Make ValueProcedure/ValueConsumer methods public. diff -r b8516934a9e5 -r 0acefec7231a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Thu Sep 25 13:53:13 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Thu Sep 25 14:02:35 2014 +0200 @@ -681,7 +681,7 @@ ValueConsumer useConsumer = new ValueConsumer() { @Override - protected void visitValue(Value operand) { + public void visitValue(Value operand) { if (isVariable(operand)) { int operandNum = operandNumber(operand); if (!liveKill.get(operandNum)) { @@ -1127,7 +1127,7 @@ op.forEachRegisterHint(targetValue, mode, new ValueProcedure() { @Override - protected Value doValue(Value registerHint) { + public Value doValue(Value registerHint) { if (isVariableOrRegister(registerHint)) { Interval from = getOrCreateInterval((AllocatableValue) registerHint); Interval to = getOrCreateInterval((AllocatableValue) targetValue); @@ -2214,7 +2214,7 @@ Interval curInterval; @Override - protected void visitValue(Value operand) { + public void visitValue(Value operand) { if (isRegister(operand)) { if (intervalFor(operand) == curInterval) { ok = true; diff -r b8516934a9e5 -r 0acefec7231a graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java --- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Sep 25 13:53:13 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Sep 25 14:02:35 2014 +0200 @@ -347,7 +347,7 @@ private final InstructionValueConsumer valueConsumer = new InstructionValueConsumer() { @Override - protected void visitValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { Object valueObject = value; if (isRegister(value)) { // Canonicalize registers valueObject = asRegister(value); diff -r b8516934a9e5 -r 0acefec7231a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueConsumer.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueConsumer.java Thu Sep 25 13:53:13 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueConsumer.java Thu Sep 25 14:02:35 2014 +0200 @@ -40,7 +40,7 @@ * @param instruction The current instruction. * @param value The value that is iterated. */ - protected void visitValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { throw GraalInternalError.shouldNotReachHere("One of the visitValue() methods must be overwritten"); } @@ -53,7 +53,7 @@ * @param mode The operand mode for the value. * @param flags A set of flags for the value. */ - protected void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { + public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { visitValue(instruction, value); } diff -r b8516934a9e5 -r 0acefec7231a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueProcedure.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueProcedure.java Thu Sep 25 13:53:13 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionValueProcedure.java Thu Sep 25 14:02:35 2014 +0200 @@ -43,7 +43,7 @@ * @param value The value that is iterated. * @return The new value to replace the value that was passed in. */ - protected Value doValue(LIRInstruction instruction, Value value) { + public Value doValue(LIRInstruction instruction, Value value) { throw GraalInternalError.shouldNotReachHere("One of the doValue() methods must be overwritten"); } @@ -57,7 +57,7 @@ * @param flags A set of flags for the value. * @return The new value to replace the value that was passed in. */ - protected Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { + public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { return doValue(instruction, value); } diff -r b8516934a9e5 -r 0acefec7231a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueConsumer.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueConsumer.java Thu Sep 25 13:53:13 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueConsumer.java Thu Sep 25 14:02:35 2014 +0200 @@ -39,7 +39,7 @@ * * @param value The value that is iterated. */ - protected void visitValue(Value value) { + public void visitValue(Value value) { throw GraalInternalError.shouldNotReachHere("One of the visitValue() methods must be overwritten"); } @@ -51,17 +51,17 @@ * @param mode The operand mode for the value. * @param flags A set of flags for the value. */ - protected void visitValue(Value value, OperandMode mode, EnumSet flags) { + public void visitValue(Value value, OperandMode mode, EnumSet flags) { visitValue(value); } @Override - protected final void visitValue(LIRInstruction instruction, Value value) { + public final void visitValue(LIRInstruction instruction, Value value) { throw GraalInternalError.shouldNotReachHere("This visitValue() method should never be called"); } @Override - protected void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { + public void visitValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { visitValue(value, mode, flags); } } \ No newline at end of file diff -r b8516934a9e5 -r 0acefec7231a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueProcedure.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueProcedure.java Thu Sep 25 13:53:13 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValueProcedure.java Thu Sep 25 14:02:35 2014 +0200 @@ -40,7 +40,7 @@ * @param value The value that is iterated. * @return The new value to replace the value that was passed in. */ - protected Value doValue(Value value) { + public Value doValue(Value value) { throw GraalInternalError.shouldNotReachHere("One of the doValue() methods must be overwritten"); } @@ -53,12 +53,12 @@ * @param flags A set of flags for the value. * @return The new value to replace the value that was passed in. */ - protected Value doValue(Value value, OperandMode mode, EnumSet flags) { + public Value doValue(Value value, OperandMode mode, EnumSet flags) { return doValue(value); } @Override - protected final Value doValue(LIRInstruction instruction, Value value) { + public final Value doValue(LIRInstruction instruction, Value value) { throw GraalInternalError.shouldNotReachHere("This doValue() method should never be called"); }