Mercurial > hg > truffle
changeset 17296:e03a25f5a260
Replace anonymous StateProcedures with Lambdas.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Mon, 29 Sep 2014 15:02:18 +0200 |
parents | ae0496f76cce |
children | 07d5cf34b3c5 |
files | graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java |
diffstat | 3 files changed, 14 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Mon Sep 29 14:48:31 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Mon Sep 29 15:02:18 2014 +0200 @@ -144,13 +144,10 @@ */ public static LabelRef getExceptionEdge(LIRInstruction op) { final LabelRef[] exceptionEdge = {null}; - op.forEachState(new StateProcedure() { - @Override - public void doState(LIRFrameState state) { - if (state.exceptionEdge != null) { - assert exceptionEdge[0] == null; - exceptionEdge[0] = state.exceptionEdge; - } + op.forEachState(state -> { + if (state.exceptionEdge != null) { + assert exceptionEdge[0] == null; + exceptionEdge[0] = state.exceptionEdge; } }); return exceptionEdge[0];
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Mon Sep 29 14:48:31 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Mon Sep 29 15:02:18 2014 +0200 @@ -281,6 +281,10 @@ instructionClass.forEachState(this, proc); } + public final void forEachState(StateProcedure proc) { + instructionClass.forEachState(this, proc); + } + // InstructionValueConsumers public final void visitEachInput(InstructionValueConsumer proc) { instructionClass.forEachUse(this, proc);
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Mon Sep 29 14:48:31 2014 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Mon Sep 29 15:02:18 2014 +0200 @@ -457,16 +457,12 @@ out.printf("nr %4d ", inst.id()).print(COLUMN_END); final StringBuilder stateString = new StringBuilder(); - inst.forEachState(new StateProcedure() { - - @Override - public void doState(LIRFrameState state) { - if (state.hasDebugInfo()) { - DebugInfo di = state.debugInfo(); - stateString.append(debugInfoToString(di.getBytecodePosition(), di.getReferenceMap(), di.getCalleeSaveInfo(), target.arch)); - } else { - stateString.append(debugInfoToString(state.topFrame, null, null, target.arch)); - } + inst.forEachState(state -> { + if (state.hasDebugInfo()) { + DebugInfo di = state.debugInfo(); + stateString.append(debugInfoToString(di.getBytecodePosition(), di.getReferenceMap(), di.getCalleeSaveInfo(), target.arch)); + } else { + stateString.append(debugInfoToString(state.topFrame, null, null, target.arch)); } }); if (stateString.length() > 0) {