*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java	Fri Jul  7 09:31:07 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java	Fri Jul  7 09:31:06 2017

*** 21,41 ****
--- 21,40 ----
   * questions.
   */
  
  package org.graalvm.compiler.lir.ssa;
  
+ import static jdk.vm.ci.code.ValueUtil.isRegister;
  import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
  import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue;
  import static jdk.vm.ci.code.ValueUtil.isRegister;
  
  import java.util.BitSet;
  import java.util.EnumSet;
  import java.util.HashMap;
  
  import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.debug.Indent;
  import org.graalvm.compiler.lir.InstructionValueConsumer;
  import org.graalvm.compiler.lir.LIR;
  import org.graalvm.compiler.lir.LIRInstruction;
  import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;

*** 65,80 ****
--- 64,80 ----
          this.defined = new HashMap<>();
      }
  
      @SuppressWarnings("try")
      public boolean verify() {
          try (Scope s = Debug.scope("SSAVerifier", lir)) {
+         DebugContext debug = lir.getDebug();
+         try (DebugContext.Scope s = debug.scope("SSAVerifier", lir)) {
              for (AbstractBlockBase<?> block : lir.getControlFlowGraph().getBlocks()) {
                  doBlock(block);
              }
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
          return true;
      }
  
      @SuppressWarnings("try")

*** 85,95 ****
--- 85,95 ----
          for (AbstractBlockBase<?> pred : b.getPredecessors()) {
              if (!b.isLoopHeader() || !pred.isLoopEnd()) {
                  doBlock(pred);
              }
          }
!         try (Indent indent = Debug.logAndIndent(Debug.INFO_LEVEL, "handle block %s", b)) {
!         try (Indent indent = lir.getDebug().logAndIndent(DebugContext.INFO_LEVEL, "handle block %s", b)) {
              assert verifyBlock(b);
          }
      }
  
      private boolean verifyBlock(AbstractBlockBase<?> block) {