src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java

*** 20,31 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test;
  
- import static org.graalvm.compiler.core.common.CompilationIdentifier.INVALID_COMPILATION_ID;
- 
  import org.junit.Assert;
  import org.junit.Test;
  
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.nodes.AbstractBeginNode;
--- 20,29 ----
*** 46,56 ****
          Debug.dump(Debug.BASIC_LOG_LEVEL, graph, "Graph");
      }
  
      @Test
      public void testImplies() {
!         StructuredGraph graph = new StructuredGraph(AllowAssumptions.YES, INVALID_COMPILATION_ID);
  
          EndNode trueEnd = graph.add(new EndNode());
          EndNode falseEnd = graph.add(new EndNode());
  
          AbstractBeginNode trueBegin = graph.add(new BeginNode());
--- 44,54 ----
          Debug.dump(Debug.BASIC_LOG_LEVEL, graph, "Graph");
      }
  
      @Test
      public void testImplies() {
!         StructuredGraph graph = new StructuredGraph.Builder(getInitialOptions(), AllowAssumptions.YES).build();
  
          EndNode trueEnd = graph.add(new EndNode());
          EndNode falseEnd = graph.add(new EndNode());
  
          AbstractBeginNode trueBegin = graph.add(new BeginNode());
*** 107,117 ****
      public static void assertDominator(Block block, Block expectedDominator) {
          Assert.assertEquals("dominator of " + block, expectedDominator, block.getDominator());
      }
  
      public static void assertDominatedSize(Block block, int size) {
!         Assert.assertEquals("number of dominated blocks of " + block, size, block.getDominated().size());
      }
  
      public static void assertPostdominator(Block block, Block expectedPostdominator) {
          Assert.assertEquals("postdominator of " + block, expectedPostdominator, block.getPostdominator());
      }
--- 105,121 ----
      public static void assertDominator(Block block, Block expectedDominator) {
          Assert.assertEquals("dominator of " + block, expectedDominator, block.getDominator());
      }
  
      public static void assertDominatedSize(Block block, int size) {
!         int count = 0;
!         Block domChild = block.getFirstDominated();
!         while (domChild != null) {
!             count++;
!             domChild = domChild.getDominatedSibling();
!         }
!         Assert.assertEquals("number of dominated blocks of " + block, size, count);
      }
  
      public static void assertPostdominator(Block block, Block expectedPostdominator) {
          Assert.assertEquals("postdominator of " + block, expectedPostdominator, block.getPostdominator());
      }