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

*** 20,38 ****
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test;
  
! import jdk.vm.ci.meta.ResolvedJavaField;
  import jdk.vm.ci.meta.ResolvedJavaType;
  
  import org.junit.Assert;
  import org.junit.Ignore;
  import org.junit.Test;
  
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.Debug.Scope;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.DebugDumpScope;
  import org.graalvm.compiler.nodes.ParameterNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;

*** 42,51 ****
--- 34,49 ----
  import org.graalvm.compiler.nodes.spi.LoweringTool;
  import org.graalvm.compiler.nodes.type.StampTool;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.common.LoweringPhase;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
+ import org.junit.Assert;
+ import org.junit.Ignore;
+ import org.junit.Test;
+ 
+ import jdk.vm.ci.meta.ResolvedJavaField;
+ import jdk.vm.ci.meta.ResolvedJavaType;
  
  public class PushNodesThroughPiTest extends GraalCompilerTest {
  
      public static class A {
  

*** 75,85 ****
--- 73,84 ----
      @Ignore
      @Test
      @SuppressWarnings("try")
      public void test1() {
          final String snippet = "test1Snippet";
          try (Scope s = Debug.scope("PushThroughPi", new DebugDumpScope(snippet))) {
+         DebugContext debug = getDebugContext();
+         try (DebugContext.Scope s = debug.scope("PushThroughPi", new DebugDumpScope(snippet))) {
              StructuredGraph graph = compileTestSnippet(snippet);
              for (ReadNode rn : graph.getNodes().filter(ReadNode.class)) {
                  OffsetAddressNode address = (OffsetAddressNode) rn.getAddress();
                  long disp = address.getOffset().asJavaConstant().asLong();
  

*** 94,104 ****
--- 93,103 ----
                  }
              }
  
              Assert.assertTrue(graph.getNodes().filter(IsNullNode.class).count() == 1);
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
      }
  
      private StructuredGraph compileTestSnippet(final String snippet) {
          StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);