*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java	Mon Mar 20 17:40:18 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java	Mon Mar 20 17:40:17 2017

*** 155,164 ****
--- 155,165 ----
          StructuredGraph graph = parseEager(name, AllowAssumptions.YES);
  
          PhaseContext context = new PhaseContext(getProviders());
          CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
          graph.clearAllStateAfter();
+         graph.setGuardsStage(StructuredGraph.GuardsStage.AFTER_FSA);
          canonicalizer.apply(graph, context);
  
          new ConvertDeoptimizeToGuardPhase().apply(graph, context);
          // new DominatorConditionalEliminationPhase(true).apply(graph, context);
          new IterativeConditionalEliminationPhase(canonicalizer, true).apply(graph, context);