# HG changeset patch # User Josef Eisl # Date 1407917001 -7200 # Node ID 1cba2ac4c0bb1f11aed97e6092d743028e3d2c99 # Parent faed55e4d84920c6479eccf82904988156224124 Use InstructionValueConsumer in CompositeValueReplacementTests. diff -r faed55e4d849 -r 1cba2ac4c0bb graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java --- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Tue Aug 12 18:36:57 2014 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest1.java Wed Aug 13 10:03:21 2014 +0200 @@ -142,19 +142,17 @@ } }); - op1.forEachInput(new InstructionValueProcedure() { + op1.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue2, value); - return value; } }); - op2.forEachInput(new InstructionValueProcedure() { + op2.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue3, value); - return value; } }); } @@ -184,19 +182,17 @@ } }); - op1.forEachInput(new InstructionValueProcedure() { + op1.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue2, value); - return value; } }); - op2.forEachInput(new InstructionValueProcedure() { + op2.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue3, value); - return value; } }); } diff -r faed55e4d849 -r 1cba2ac4c0bb graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest2.java --- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest2.java Tue Aug 12 18:36:57 2014 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest2.java Wed Aug 13 10:03:21 2014 +0200 @@ -143,19 +143,17 @@ } }); - op1.forEachInput(new InstructionValueProcedure() { + op1.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue2, value); - return value; } }); - op2.forEachInput(new InstructionValueProcedure() { + op2.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue3, value); - return value; } }); } @@ -185,19 +183,17 @@ } }); - op1.forEachInput(new InstructionValueProcedure() { + op1.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue2, value); - return value; } }); - op2.forEachInput(new InstructionValueProcedure() { + op2.visitEachInput(new InstructionValueConsumer() { @Override - public Value doValue(LIRInstruction instruction, Value value) { + public void visitValue(LIRInstruction instruction, Value value) { assertEquals(dummyValue3, value); - return value; } }); }