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

*** 20,39 ****
--- 20,38 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test.backend;
  
  import jdk.vm.ci.code.Architecture;
  
  import org.graalvm.compiler.core.GraalCompiler;
  import org.graalvm.compiler.core.test.GraalCompilerTest;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.lir.gen.LIRGenerationResult;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  
+ import jdk.vm.ci.code.Architecture;
+ 
  public abstract class BackendTest extends GraalCompilerTest {
  
      public BackendTest() {
          super();
      }

*** 42,55 ****
--- 41,55 ----
          super(arch);
      }
  
      @SuppressWarnings("try")
      protected LIRGenerationResult getLIRGenerationResult(final StructuredGraph graph) {
          try (Scope s = Debug.scope("FrontEnd")) {
+         DebugContext debug = graph.getDebug();
+         try (DebugContext.Scope s = debug.scope("FrontEnd")) {
              GraalCompiler.emitFrontEnd(getProviders(), getBackend(), graph, getDefaultGraphBuilderSuite(), OptimisticOptimizations.NONE, graph.getProfilingInfo(), createSuites(graph.getOptions()));
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
  
          LIRGenerationResult lirGen = GraalCompiler.emitLIR(getBackend(), graph, null, null, createLIRSuites(graph.getOptions()));
          return lirGen;
      }