*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java	Fri Jul  7 09:30:02 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java	Fri Jul  7 09:30:02 2017

*** 20,48 ****
--- 20,49 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.amd64;
  
  import static org.graalvm.compiler.core.common.GraalOptions.CanOmitFrame;
  import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
  import static org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry;
  import static jdk.vm.ci.amd64.AMD64.r10;
  import static jdk.vm.ci.amd64.AMD64.rax;
  import static jdk.vm.ci.amd64.AMD64.rsp;
  import static jdk.vm.ci.code.ValueUtil.asRegister;
+ import static org.graalvm.compiler.core.common.GraalOptions.CanOmitFrame;
+ import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
+ import static org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry;
  
  import org.graalvm.compiler.asm.Assembler;
  import org.graalvm.compiler.asm.Label;
  import org.graalvm.compiler.asm.amd64.AMD64Address;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
  import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
  import org.graalvm.compiler.code.CompilationResult;
  import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
+ import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
  import org.graalvm.compiler.core.target.Backend;
+ import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotDataBuilder;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
  import org.graalvm.compiler.hotspot.HotSpotHostBackend;
  import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;

*** 207,223 ****
--- 208,225 ----
          // - makes no foreign calls (which require an aligned stack)
          HotSpotLIRGenerationResult gen = (HotSpotLIRGenerationResult) lirGenRen;
          LIR lir = gen.getLIR();
          assert gen.getDeoptimizationRescueSlot() == null || frameMap.frameNeedsAllocating() : "method that can deoptimize must have a frame";
          OptionValues options = lir.getOptions();
+         DebugContext debug = lir.getDebug();
          boolean omitFrame = CanOmitFrame.getValue(options) && !frameMap.frameNeedsAllocating() && !lir.hasArgInCallerFrame() && !gen.hasForeignCall();
  
          Stub stub = gen.getStub();
          Assembler masm = createAssembler(frameMap);
          HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null, omitFrame);
          DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget());
!         CompilationResultBuilder crb = factory.createBuilder(getCodeCache(), getForeignCalls(), frameMap, masm, dataBuilder, frameContext, options, debug, compilationResult);
          crb.setTotalFrameSize(frameMap.totalFrameSize());
          crb.setMaxInterpreterFrameSize(gen.getMaxInterpreterFrameSize());
          StackSlot deoptimizationRescueSlot = gen.getDeoptimizationRescueSlot();
          if (deoptimizationRescueSlot != null && stub == null) {
              crb.compilationResult.setCustomStackAreaOffset(deoptimizationRescueSlot);