--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java	2017-03-20 17:37:09.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java	2017-03-20 17:37:08.000000000 -0700
@@ -45,11 +45,22 @@
 
             if (block.getDominator() != null) {
                 assert block.getDominator().getId() < block.getId();
-                assert block.getDominator().getDominated().contains(block);
+
+                AbstractBlockBase<?> domChild = block.getDominator().getFirstDominated();
+                while (domChild != null) {
+                    if (domChild == block) {
+                        break;
+                    }
+                    domChild = domChild.getDominatedSibling();
+                }
+                assert domChild != null : "dominators must contain block";
             }
-            for (T dominated : block.getDominated()) {
+
+            T dominated = block.getFirstDominated();
+            while (dominated != null) {
                 assert dominated.getId() > block.getId();
                 assert dominated.getDominator() == block;
+                dominated = dominated.getDominatedSibling();
             }
 
             T postDominatorBlock = block.getPostdominator();