*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstruction.java	Fri Jul  7 09:30:37 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRInstruction.java	Fri Jul  7 09:30:37 2017

*** 20,29 ****
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.lir;
  
+ import static jdk.vm.ci.code.ValueUtil.isStackSlot;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.OUTGOING;

*** 32,53 ****
--- 33,51 ----
  import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandMode.ALIVE;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandMode.DEF;
  import static org.graalvm.compiler.lir.LIRInstruction.OperandMode.TEMP;
  import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
  
  import java.lang.annotation.ElementType;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.lang.annotation.Target;
  import java.util.Arrays;
  import java.util.EnumMap;
  import java.util.EnumSet;
  
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.DebugCounter;
  import org.graalvm.compiler.graph.NodeSourcePosition;
  import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
  import org.graalvm.compiler.lir.StandardOp.MoveOp;
  import org.graalvm.compiler.lir.StandardOp.ValueMoveOp;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;

*** 202,218 ****
--- 200,213 ----
      /**
       * The source position of the code that generated this instruction.
       */
      private NodeSourcePosition position;
  
      private static final DebugCounter LIR_NODE_COUNT = Debug.counter("LIRNodes");
  
      /**
       * Constructs a new LIR instruction.
       */
      public LIRInstruction(LIRInstructionClass<? extends LIRInstruction> c) {
          LIR_NODE_COUNT.increment();
          instructionClass = c;
          assert c.getClazz() == this.getClass();
          id = -1;
      }