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

*** 20,31 ****
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.lir.alloc.lsra;
  
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.lir.gen.LIRGenerationResult;
  import static org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
  import org.graalvm.compiler.lir.phases.LIRPhase;
  
  import jdk.vm.ci.code.TargetDescription;

*** 45,61 ****
--- 44,63 ----
          apply(target, lirGenRes, context, true);
      }
  
      @SuppressWarnings("try")
      public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context, boolean dumpLIR) {
          try (Scope s = Debug.scope(getName(), this)) {
+         DebugContext debug = lirGenRes.getLIR().getDebug();
+         try (DebugContext.Scope s = debug.scope(getName(), this)) {
              run(target, lirGenRes, context);
-             if (dumpLIR && Debug.isDumpEnabled(Debug.VERBOSE_LEVEL)) {
                  Debug.dump(Debug.VERBOSE_LEVEL, lirGenRes.getLIR(), "After %s", getName());
+                 if (debug.isDumpEnabled(DebugContext.VERBOSE_LEVEL)) {
+                     debug.dump(DebugContext.VERBOSE_LEVEL, lirGenRes.getLIR(), "After %s", getName());
+                 }
              }
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
      }
  
      protected abstract void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context);