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

*** 20,36 ****
--- 20,31 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test;
  
  import org.junit.Assert;
  import org.junit.Ignore;
  import org.junit.Test;
  
  import org.graalvm.compiler.api.directives.GraalDirectives;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.debug.DebugDumpScope;
  import org.graalvm.compiler.nodes.DeoptimizeNode;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.memory.ReadNode;

*** 40,49 ****
--- 35,47 ----
  import org.graalvm.compiler.phases.common.FloatingReadPhase;
  import org.graalvm.compiler.phases.common.GuardLoweringPhase;
  import org.graalvm.compiler.phases.common.LoweringPhase;
  import org.graalvm.compiler.phases.tiers.MidTierContext;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
+ import org.junit.Assert;
+ import org.junit.Ignore;
+ import org.junit.Test;
  
  /**
   * Tests that the hub access and the null check are folded.
   */
  public class ImplicitNullCheckTest extends GraphScheduleTest {

*** 66,86 ****
--- 64,85 ----
          test("test1Snippet");
      }
  
      @SuppressWarnings("try")
      private void test(final String snippet) {
          try (Scope s = Debug.scope("FloatingReadTest", new DebugDumpScope(snippet))) {
              StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
+         DebugContext debug = getDebugContext();
+         try (DebugContext.Scope s = debug.scope("FloatingReadTest", new DebugDumpScope(snippet))) {
+             StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES, debug);
              PhaseContext context = new PhaseContext(getProviders());
              new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
              new FloatingReadPhase().apply(graph);
              MidTierContext midTierContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
              new GuardLoweringPhase().apply(graph, midTierContext);
  
              Assert.assertEquals(0, graph.getNodes(DeoptimizeNode.TYPE).count());
              Assert.assertTrue(graph.getNodes().filter(ReadNode.class).first().canNullCheck());
  
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
      }
  }