*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java	Fri Jul  7 09:31:22 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java	Fri Jul  7 09:31:21 2017

*** 39,50 ****
--- 39,48 ----
  
  import org.graalvm.compiler.api.replacements.MethodSubstitution;
  import org.graalvm.compiler.bytecode.Bytecode;
  import org.graalvm.compiler.bytecode.Bytecodes;
  import org.graalvm.compiler.core.common.type.StampFactory;
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.DebugCounter;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.IterableNodeType;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.graph.NodeInputList;
  import org.graalvm.compiler.graph.NodeSourcePosition;

*** 70,81 ****
--- 68,77 ----
   */
  @NodeInfo(nameTemplate = "@{p#code/s}:{p#bci}", cycles = CYCLES_0, size = SIZE_1)
  public final class FrameState extends VirtualState implements IterableNodeType {
      public static final NodeClass<FrameState> TYPE = NodeClass.create(FrameState.class);
  
      private static final DebugCounter FRAMESTATES_COUNTER = Debug.counter("FrameStateCount");
  
      /**
       * Marker value for the second slot of values that occupy two local variable or expression stack
       * slots. The marker value is used by the bytecode parser, but replaced with {@code null} in the
       * {@link #values} of the {@link FrameState}.
       */

*** 155,165 ****
--- 151,160 ----
  
          this.rethrowException = rethrowException;
          this.duringCall = duringCall;
          assert !this.rethrowException || this.stackSize == 1 : "must have exception on top of the stack";
          assert this.locksSize() == this.monitorIdCount();
          FRAMESTATES_COUNTER.increment();
      }
  
      public FrameState(FrameState outerFrameState, Bytecode code, int bci, List<ValueNode> values, int localsSize, int stackSize, boolean rethrowException, boolean duringCall,
                      List<MonitorIdNode> monitorIds, List<EscapeObjectState> virtualObjectMappings) {
          this(outerFrameState, code, bci, localsSize, stackSize, values.size() - localsSize - stackSize, rethrowException, duringCall, monitorIds, virtualObjectMappings);