*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java	Fri Jul  7 09:29:41 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java	Fri Jul  7 09:29:41 2017

*** 25,107 ****
--- 25,113 ----
  import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions;
  
  import java.lang.reflect.Method;
  import java.lang.reflect.Modifier;
  
  import org.junit.Test;
  
  import org.graalvm.compiler.api.test.Graal;
! import org.graalvm.compiler.debug.DebugCloseable;
! import org.graalvm.compiler.debug.DebugConfigScope;
! import org.graalvm.compiler.debug.DebugHandlersFactory;
+ import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.debug.Indent;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.java.GraphBuilderPhase;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.Phase;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.VerifyPhase.VerificationError;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.phases.util.Providers;
  import org.graalvm.compiler.phases.verify.VerifyDebugUsage;
  import org.graalvm.compiler.runtime.RuntimeProvider;
+ import org.junit.Test;
  
  import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  public class VerifyDebugUsageTest {
  
      private static class InvalidLogUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
+             DebugContext debug = graph.getDebug();
              for (Node n : graph.getNodes()) {
!                 Debug.log("%s", n.toString());
!                 debug.log("%s", n.toString());
              }
          }
  
      }
  
      private static class InvalidLogAndIndentUsagePhase extends Phase {
  
          @Override
          @SuppressWarnings("try")
          protected void run(StructuredGraph graph) {
              try (Indent i = Debug.logAndIndent("%s", graph.toString())) {
+             DebugContext debug = graph.getDebug();
+             try (Indent i = debug.logAndIndent("%s", graph.toString())) {
                  for (Node n : graph.getNodes()) {
!                     Debug.log("%s", n);
!                     debug.log("%s", n);
                  }
              }
          }
  
      }
  
      private static class InvalidDumpUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.dump(Debug.BASIC_LEVEL, graph, "%s", graph.toString());
!             DebugContext debug = graph.getDebug();
+             debug.dump(DebugContext.BASIC_LEVEL, graph, "%s", graph.toString());
          }
      }
  
      private static class InvalidDumpLevelPhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.dump(Debug.VERY_DETAILED_LEVEL + 1, graph, "%s", graph);
!             DebugContext debug = graph.getDebug();
+             debug.dump(DebugContext.VERY_DETAILED_LEVEL + 1, graph, "%s", graph);
          }
      }
  
      private static class NonConstantDumpLevelPhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.dump(getLevel(), graph, "%s", graph);
!             DebugContext debug = graph.getDebug();
+             debug.dump(getLevel(), graph, "%s", graph);
          }
  
          int getLevel() {
              return 10;
          }

*** 109,205 ****
--- 115,220 ----
  
      private static class InvalidVerifyUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.verify(graph, "%s", graph.toString());
!             DebugContext debug = graph.getDebug();
+             debug.verify(graph, "%s", graph.toString());
          }
  
      }
  
      private static class InvalidConcatLogUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
+             DebugContext debug = graph.getDebug();
              for (Node n : graph.getNodes()) {
!                 Debug.log("error " + n);
!                 debug.log("error " + n);
              }
          }
  
      }
  
      private static class InvalidConcatLogAndIndentUsagePhase extends Phase {
  
          @Override
          @SuppressWarnings("try")
          protected void run(StructuredGraph graph) {
              try (Indent i = Debug.logAndIndent("error " + graph)) {
+             DebugContext debug = graph.getDebug();
+             try (Indent i = debug.logAndIndent("error " + graph)) {
                  for (Node n : graph.getNodes()) {
!                     Debug.log("%s", n);
!                     debug.log("%s", n);
                  }
              }
          }
  
      }
  
      private static class InvalidConcatDumpUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.dump(Debug.BASIC_LEVEL, graph, "error " + graph);
!             DebugContext debug = graph.getDebug();
+             debug.dump(DebugContext.BASIC_LEVEL, graph, "error " + graph);
          }
  
      }
  
      private static class InvalidConcatVerifyUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.verify(graph, "error " + graph);
!             DebugContext debug = graph.getDebug();
+             debug.verify(graph, "error " + graph);
          }
  
      }
  
      private static class ValidLogUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
+             DebugContext debug = graph.getDebug();
              for (Node n : graph.getNodes()) {
!                 Debug.log("%s", n);
!                 debug.log("%s", n);
              }
          }
  
      }
  
      private static class ValidLogAndIndentUsagePhase extends Phase {
  
          @Override
          @SuppressWarnings("try")
          protected void run(StructuredGraph graph) {
              try (Indent i = Debug.logAndIndent("%s", graph)) {
+             DebugContext debug = graph.getDebug();
+             try (Indent i = debug.logAndIndent("%s", graph)) {
                  for (Node n : graph.getNodes()) {
!                     Debug.log("%s", n);
!                     debug.log("%s", n);
                  }
              }
          }
  
      }
  
      private static class ValidDumpUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.dump(Debug.BASIC_LEVEL, graph, "%s", graph);
!             DebugContext debug = graph.getDebug();
+             debug.dump(DebugContext.BASIC_LEVEL, graph, "%s", graph);
          }
  
      }
  
      private static class ValidVerifyUsagePhase extends Phase {
  
          @Override
          protected void run(StructuredGraph graph) {
!             Debug.verify(graph, "%s", graph);
!             DebugContext debug = graph.getDebug();
+             debug.verify(graph, "%s", graph);
          }
  
      }
  
      private static class InvalidGraalErrorGuaranteePhase extends Phase {

*** 330,345 ****
--- 345,362 ----
          PhaseSuite<HighTierContext> graphBuilderSuite = new PhaseSuite<>();
          Plugins plugins = new Plugins(new InvocationPlugins());
          GraphBuilderConfiguration config = GraphBuilderConfiguration.getDefault(plugins).withEagerResolving(true);
          graphBuilderSuite.appendPhase(new GraphBuilderPhase(config));
          HighTierContext context = new HighTierContext(providers, graphBuilderSuite, OptimisticOptimizations.NONE);
+         OptionValues options = getInitialOptions();
+         DebugContext debug = DebugContext.create(options, DebugHandlersFactory.LOADER);
          for (Method m : c.getDeclaredMethods()) {
              if (!Modifier.isNative(m.getModifiers()) && !Modifier.isAbstract(m.getModifiers())) {
                  ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m);
!                 StructuredGraph graph = new StructuredGraph.Builder(getInitialOptions()).method(method).build();
!                 StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).build();
                  graphBuilderSuite.apply(graph, context);
!                 try (DebugConfigScope s = Debug.disableIntercept()) {
!                 try (DebugCloseable s = debug.disableIntercept()) {
                      new VerifyDebugUsage().apply(graph, context);
                  }
              }
          }
      }