# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1431507254 -7200
# Node ID ead75077228bed6148e434898cfe4c4cc32d1c06
# Parent  b0a82dcf74d0fe02993061da07fdbe49e27f0023
rename GraphBuilderPhase.getFrameState to getFrameStateBuilder

diff -r b0a82dcf74d0 -r ead75077228b graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java
--- 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);
diff -r b0a82dcf74d0 -r ead75077228b graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Wed May 13 10:31:19 2015 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Wed May 13 10:54:14 2015 +0200
@@ -1426,8 +1426,7 @@
                 boolean check(boolean pluginResult) {
                     if (pluginResult == true) {
                         int expectedStackSize = beforeStackSize + resultType.getSlotCount();
-                        assert expectedStackSize == frameState.stackSize : error("plugin manipulated the stack incorrectly: expected=%d, actual=%d", expectedStackSize,
-                                        frameState.stackSize);
+                        assert expectedStackSize == frameState.stackSize : error("plugin manipulated the stack incorrectly: expected=%d, actual=%d", expectedStackSize, frameState.stackSize);
                         NodeIterable<Node> newNodes = graph.getNewNodes(mark);
                         assert !needsNullCheck || isPointerNonNull(args[0].stamp()) : error("plugin needs to null check the receiver of %s: receiver=%s", targetMethod.format("%H.%n(%p)"), args[0]);
                         for (Node n : newNodes) {
@@ -3532,7 +3531,7 @@
                 return method;
             }
 
-            public FrameStateBuilder getFrameState() {
+            public FrameStateBuilder getFrameStateBuilder() {
                 return frameState;
             }