Mercurial > hg > truffle
changeset 15271:cb16b744e1b5
Move HotSpot-specific assertion from DebugInfoBuilder.computeFrameForState to HotSpotDebugInfoBuilder
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 22 Apr 2014 19:52:05 +0200 |
parents | 051935b55555 |
children | 943f39fab816 |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Tue Apr 22 18:54:03 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Tue Apr 22 19:52:05 2014 +0200 @@ -129,7 +129,6 @@ if (state.outerFrameState() != null) { caller = computeFrameForState(state.outerFrameState()); } - assert state.bci >= BytecodeFrame.BEFORE_BCI : "bci == " + state.bci; return new BytecodeFrame(caller, state.method(), state.bci, state.rethrowException(), state.duringCall(), values, numLocals, numStack, numLocks); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Tue Apr 22 18:54:03 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Tue Apr 22 19:52:05 2014 +0200 @@ -64,4 +64,10 @@ protected LIRFrameState newLIRFrameState(LabelRef exceptionEdge, BytecodeFrame frame, VirtualObject[] virtualObjectsArray) { return new HotSpotLIRFrameState(frame, virtualObjectsArray, exceptionEdge); } + + @Override + protected BytecodeFrame computeFrameForState(FrameState state) { + assert state.bci >= 0 || state.bci == BytecodeFrame.BEFORE_BCI; + return super.computeFrameForState(state); + } }