# HG changeset patch # User Josef Eisl # Date 1437727859 -7200 # Node ID 85278a174428f406c9885dd0c9ea5a22f821dfab # Parent f24100915864935ea2f816031fcabe9b836a13b0 ValueSet: remove #addLiveValues. diff -r f24100915864 -r 85278a174428 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java Fri Jul 24 10:47:42 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java Fri Jul 24 10:50:59 2015 +0200 @@ -28,6 +28,8 @@ import jdk.internal.jvmci.meta.*; +import com.oracle.graal.lir.*; +import com.oracle.graal.lir.LIRInstruction.*; import com.oracle.graal.lir.framemap.*; final class RegStackValueSet extends LiveValueSet { @@ -120,8 +122,13 @@ } public void addLiveValues(ReferenceMapBuilder refMap) { - registers.addLiveValues(refMap); - stack.addLiveValues(refMap); + ValueConsumer addLiveValue = new ValueConsumer() { + public void visitValue(Value value, OperandMode mode, EnumSet flags) { + refMap.addLiveValue(value); + } + }; + registers.forEach(null, null, null, addLiveValue); + stack.forEach(null, null, null, addLiveValue); if (extraStack != null) { for (Value v : extraStack) { refMap.addLiveValue(v); diff -r f24100915864 -r 85278a174428 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/ValueSet.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/ValueSet.java Fri Jul 24 10:47:42 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/ValueSet.java Fri Jul 24 10:50:59 2015 +0200 @@ -29,7 +29,6 @@ import com.oracle.graal.lir.*; import com.oracle.graal.lir.LIRInstruction.OperandFlag; import com.oracle.graal.lir.LIRInstruction.OperandMode; -import com.oracle.graal.lir.framemap.*; public final class ValueSet { private Value[] values; @@ -122,14 +121,6 @@ return false; } - public void addLiveValues(ReferenceMapBuilder refMap) { - for (Value v : values) { - if (v != null) { - refMap.addLiveValue(v); - } - } - } - public void forEach(LIRInstruction inst, OperandMode mode, EnumSet flags, InstructionValueProcedure proc) { for (int i = 0; i < values.length; i++) { if (values[i] != null) {