*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java	Fri Jul  7 09:31:05 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/gen/LIRGenerator.java	Fri Jul  7 09:31:04 2017

*** 45,54 ****
--- 45,55 ----
  import org.graalvm.compiler.core.common.type.Stamp;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.debug.TTY;
  import org.graalvm.compiler.graph.NodeSourcePosition;
  import org.graalvm.compiler.lir.ConstantValue;
+ import org.graalvm.compiler.lir.LIR;
  import org.graalvm.compiler.lir.LIRFrameState;
  import org.graalvm.compiler.lir.LIRInstruction;
  import org.graalvm.compiler.lir.LIRVerifier;
  import org.graalvm.compiler.lir.LabelRef;
  import org.graalvm.compiler.lir.StandardOp;

*** 300,315 ****
--- 301,317 ----
          currentPosition = position;
      }
  
      @Override
      public <I extends LIRInstruction> I append(I op) {
+         LIR lir = res.getLIR();
          if (printIrWithLir) {
              TTY.println(op.toStringWithIdPrefix());
              TTY.println();
          }
          assert LIRVerifier.verify(op);
!         ArrayList<LIRInstruction> lirForBlock = res.getLIR().getLIRforBlock(getCurrentBlock());
!         ArrayList<LIRInstruction> lirForBlock = lir.getLIRforBlock(getCurrentBlock());
          op.setPosition(currentPosition);
          lirForBlock.add(op);
          return op;
      }