*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.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/IfCanonicalizerTest.java	Fri Jul  7 09:29:32 2017

*** 20,32 ****
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test;
  
! import org.junit.Test;
  
  import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.nodes.ConstantNode;
  import org.graalvm.compiler.nodes.FrameState;
  import org.graalvm.compiler.nodes.IfNode;
  import org.graalvm.compiler.nodes.ParameterNode;

*** 38,47 ****
--- 36,46 ----
  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.Test;
  
  /**
   * In the following tests, the usages of local variable "a" are replaced with the integer constant
   * 0. Then canonicalization is applied and it is verified that the resulting graph is equal to the
   * graph of the method that just has a "return 1" statement in it.

*** 235,252 ****
--- 234,252 ----
          assertDeepEquals(count, graph.getNodes().filter(IfNode.class).count());
      }
  
      private void test(String snippet) {
          StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
+         DebugContext debug = graph.getDebug();
          ParameterNode param = graph.getNodes(ParameterNode.TYPE).iterator().next();
          ConstantNode constant = ConstantNode.forInt(0, graph);
          for (Node n : param.usages().snapshot()) {
              if (!(n instanceof FrameState)) {
                  n.replaceFirstInput(param, constant);
              }
          }
!         Debug.dump(Debug.BASIC_LEVEL, graph, "Graph");
!         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
          new CanonicalizerPhase().apply(graph, new PhaseContext(getProviders()));
          for (FrameState fs : param.usages().filter(FrameState.class).snapshot()) {
              fs.replaceFirstInput(param, null);
              param.safeDelete();
          }