Mercurial > hg > graal-compiler
diff graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java @ 21363:ead75077228b
rename GraphBuilderPhase.getFrameState to getFrameStateBuilder
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 13 May 2015 10:54:14 +0200 |
parents | graal/com.oracle.graal.java/src/com/oracle/graal/java/HIRFrameStateBuilder.java@6d5a198d23e6 |
children | 600d37d28494 |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Wed May 13 10:31:19 2015 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Wed May 13 10:54:14 2015 +0200 @@ -214,7 +214,7 @@ public FrameState create(int bci, BytecodeParser parent, boolean duringCall) { if (outerFrameState == null && parent != null) { - outerFrameState = parent.getFrameState().create(parent.bci(), null); + outerFrameState = parent.getFrameStateBuilder().create(parent.bci(), null); } if (bci == BytecodeFrame.AFTER_EXCEPTION_BCI && parent != null) { FrameState newFrameState = outerFrameState.duplicateModified(outerFrameState.bci, true, Kind.Void, this.peek(0)); @@ -231,7 +231,7 @@ if (HideSubstitutionStates.getValue()) { if (parser.parsingIntrinsic()) { // Attribute to the method being replaced - return new BytecodePosition(parent.getFrameState().createBytecodePosition(parent.bci()), parser.intrinsicContext.getOriginalMethod(), -1); + return new BytecodePosition(parent.getFrameStateBuilder().createBytecodePosition(parent.bci()), parser.intrinsicContext.getOriginalMethod(), -1); } // Skip intrinsic frames parent = (BytecodeParser) parser.getNonReplacementAncestor(); @@ -242,7 +242,7 @@ private BytecodePosition create(BytecodePosition o, int bci, BytecodeParser parent) { BytecodePosition outer = o; if (outer == null && parent != null) { - outer = parent.getFrameState().createBytecodePosition(parent.bci()); + outer = parent.getFrameStateBuilder().createBytecodePosition(parent.bci()); } if (bci == BytecodeFrame.AFTER_EXCEPTION_BCI && parent != null) { return FrameState.toBytecodePosition(outerFrameState);