Mercurial > hg > truffle
diff graal/GraalCompiler/src/com/sun/c1x/ir/StateSplit.java @ 2622:91d3952f7eb7
Framestate work : using stateAFter and reducting the number of nodes with framestates. Intermediate state (does not pass tests)
author | Gilles Duboscq <gilles.duboscq@oracle.com> |
---|---|
date | Tue, 10 May 2011 12:37:46 +0200 |
parents | 3558ca7088c0 |
children | 569228710be8 |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/StateSplit.java Tue May 10 11:55:12 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/StateSplit.java Tue May 10 12:37:46 2011 +0200 @@ -33,7 +33,7 @@ public abstract class StateSplit extends Instruction { private static final int INPUT_COUNT = 1; - private static final int INPUT_STATE_BEFORE = 0; + private static final int INPUT_STATE_AFTER = 0; private static final int SUCCESSOR_COUNT = 0; @@ -51,12 +51,12 @@ * The state for this instruction. */ @Override - public FrameState stateBefore() { - return (FrameState) inputs().get(super.inputCount() + INPUT_STATE_BEFORE); + public FrameState stateAfter() { + return (FrameState) inputs().get(super.inputCount() + INPUT_STATE_AFTER); } - public FrameState setStateBefore(FrameState n) { - return (FrameState) inputs().set(super.inputCount() + INPUT_STATE_BEFORE, n); + public FrameState setStateAfter(FrameState n) { + return (FrameState) inputs().set(super.inputCount() + INPUT_STATE_AFTER, n); } /** @@ -66,14 +66,14 @@ * @param successorCount * @param graph */ - public StateSplit(CiKind kind, FrameState stateBefore, int inputCount, int successorCount, Graph graph) { + public StateSplit(CiKind kind, FrameState stateAfter, int inputCount, int successorCount, Graph graph) { super(kind, inputCount + INPUT_COUNT, successorCount + SUCCESSOR_COUNT, graph); - setStateBefore(stateBefore); + this.setStateAfter(stateAfter); } @Override public boolean canTrap() { - return stateBefore() != null; + return true; } }