Mercurial > hg > truffle
changeset 17279:b8516934a9e5
Make InstructionStateProcedure a FunctionalInterface.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Thu, 25 Sep 2014 13:53:13 +0200 |
parents | 5cb1c3698809 |
children | 0acefec7231a |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionStateProcedure.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StateProcedure.java graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java |
diffstat | 5 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Thu Sep 25 10:51:30 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java Thu Sep 25 13:53:13 2014 +0200 @@ -1795,7 +1795,7 @@ InstructionStateProcedure stateProc = new InstructionStateProcedure() { @Override - protected void doState(LIRInstruction op, LIRFrameState state) { + public void doState(LIRInstruction op, LIRFrameState state) { computeDebugInfo(iw, op, state); } };
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionStateProcedure.java Thu Sep 25 10:51:30 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/InstructionStateProcedure.java Thu Sep 25 13:53:13 2014 +0200 @@ -22,7 +22,8 @@ */ package com.oracle.graal.lir; -public abstract class InstructionStateProcedure { +@FunctionalInterface +public interface InstructionStateProcedure { - protected abstract void doState(LIRInstruction instruction, LIRFrameState state); + void doState(LIRInstruction instruction, LIRFrameState state); } \ No newline at end of file
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Thu Sep 25 10:51:30 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIR.java Thu Sep 25 13:53:13 2014 +0200 @@ -146,7 +146,7 @@ final LabelRef[] exceptionEdge = {null}; op.forEachState(new StateProcedure() { @Override - protected void doState(LIRFrameState state) { + public void doState(LIRFrameState state) { if (state.exceptionEdge != null) { assert exceptionEdge[0] == null; exceptionEdge[0] = state.exceptionEdge;
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StateProcedure.java Thu Sep 25 10:51:30 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StateProcedure.java Thu Sep 25 13:53:13 2014 +0200 @@ -22,12 +22,13 @@ */ package com.oracle.graal.lir; -public abstract class StateProcedure extends InstructionStateProcedure { +@FunctionalInterface +public interface StateProcedure extends InstructionStateProcedure { - protected abstract void doState(LIRFrameState state); + void doState(LIRFrameState state); @Override - protected final void doState(LIRInstruction instruction, LIRFrameState state) { + default void doState(LIRInstruction instruction, LIRFrameState state) { doState(state); } } \ No newline at end of file
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Thu Sep 25 10:51:30 2014 +0200 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Thu Sep 25 13:53:13 2014 +0200 @@ -460,7 +460,7 @@ inst.forEachState(new StateProcedure() { @Override - protected void doState(LIRFrameState state) { + public void doState(LIRFrameState state) { if (state.hasDebugInfo()) { DebugInfo di = state.debugInfo(); stateString.append(debugInfoToString(di.getBytecodePosition(), di.getReferenceMap(), di.getCalleeSaveInfo(), target.arch));