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

*** 22,39 ****
--- 22,33 ----
   */
  package org.graalvm.compiler.core.test.ea;
  
  import java.util.List;
  
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  import org.junit.Assert;
  
  import org.graalvm.compiler.core.test.GraalCompilerTest;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.nodes.ReturnNode;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.java.NewArrayNode;
  import org.graalvm.compiler.nodes.java.NewInstanceNode;

*** 41,50 ****
--- 35,48 ----
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
  import org.graalvm.compiler.phases.common.inlining.InliningPhase;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
+ import org.junit.Assert;
+ 
+ import jdk.vm.ci.meta.JavaConstant;
+ import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  //JaCoCo Exclude
  
  /**
   * This base class for all Escape Analysis tests does not contain tests itself, therefore it is not

*** 152,169 ****
--- 150,168 ----
      }
  
      @SuppressWarnings("try")
      protected void prepareGraph(String snippet, boolean iterativeEscapeAnalysis) {
          ResolvedJavaMethod method = getResolvedJavaMethod(snippet);
          try (Scope s = Debug.scope(getClass(), method, getCodeCache())) {
              graph = parseEager(method, AllowAssumptions.YES);
+         DebugContext debug = getDebugContext();
+         try (DebugContext.Scope s = debug.scope(getClass(), method, getCodeCache())) {
+             graph = parseEager(method, AllowAssumptions.YES, debug);
              context = getDefaultHighTierContext();
              new InliningPhase(new CanonicalizerPhase()).apply(graph, context);
              new DeadCodeEliminationPhase().apply(graph);
              new CanonicalizerPhase().apply(graph, context);
              new PartialEscapePhase(iterativeEscapeAnalysis, false, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
              returnNodes = graph.getNodes(ReturnNode.TYPE).snapshot();
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
      }
  }