# HG changeset patch # User Josef Eisl # Date 1411995738 -7200 # Node ID e03a25f5a260184fb8f6542488fbd6b8aaa00437 # Parent ae0496f76ccea1b9c51743fe79308670cddb6619 Replace anonymous StateProcedures with Lambdas. diff -r ae0496f76cce -r e03a25f5a260 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java --- 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]; diff -r ae0496f76cce -r e03a25f5a260 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java --- 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); diff -r ae0496f76cce -r e03a25f5a260 graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java --- 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) {