Mercurial > hg > graal-compiler
changeset 22342:85278a174428
ValueSet: remove #addLiveValues.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Fri, 24 Jul 2015 10:50:59 +0200 |
parents | f24100915864 |
children | 16e76320d7af |
files | graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/RegStackValueSet.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/dfa/ValueSet.java |
diffstat | 2 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- 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<RegStackValueSet> { @@ -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<OperandFlag> 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);
--- 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<OperandFlag> flags, InstructionValueProcedure proc) { for (int i = 0; i < values.length; i++) { if (values[i] != null) {