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

*** 22,32 ****
--- 22,32 ----
   */
  package org.graalvm.compiler.lir.gen;
  
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.CompilationIdentifier.Verbosity;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.lir.LIR;
  import org.graalvm.compiler.lir.LIRInstruction;
  import org.graalvm.compiler.lir.framemap.FrameMap;
  import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
  import org.graalvm.util.EconomicMap;

*** 63,73 ****
--- 63,74 ----
  
      /**
       * Adds a comment to a {@link LIRInstruction}. Existing comments are replaced.
       */
      public final void setComment(LIRInstruction op, String comment) {
          if (Debug.isDumpEnabled(Debug.BASIC_LEVEL)) {
+         DebugContext debug = lir.getDebug();
+         if (debug.isDumpEnabled(DebugContext.BASIC_LEVEL)) {
              if (comments == null) {
                  comments = EconomicMap.create(Equivalence.IDENTITY);
              }
              comments.put(op, comment);
          }