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

*** 20,31 ****
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test;
  
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.debug.DebugDumpScope;
  import org.graalvm.compiler.loop.DefaultLoopPolicies;
  import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase;
  import org.graalvm.compiler.nodes.LoopBeginNode;
  import org.graalvm.compiler.nodes.StructuredGraph;

*** 81,97 ****
--- 80,97 ----
          test("testNegativeTripCount", 0);
      }
  
      @SuppressWarnings("try")
      private void test(String snippet, int loopCount) {
          try (Scope s = Debug.scope(getClass().getSimpleName(), new DebugDumpScope(snippet))) {
              final StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
+         DebugContext debug = getDebugContext();
+         try (DebugContext.Scope s = debug.scope(getClass().getSimpleName(), new DebugDumpScope(snippet))) {
+             final StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO, debug);
  
              PhaseContext context = new PhaseContext(getProviders());
              new LoopFullUnrollPhase(new CanonicalizerPhase(), new DefaultLoopPolicies()).apply(graph, context);
  
              assertTrue(graph.getNodes().filter(LoopBeginNode.class).count() == loopCount);
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
      }
  }