Schedule floating control.

src/compiler/verifier.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/verifier.h"
 
 #include <deque>
 #include <queue>
 
 #include "src/compiler/generic-algorithm.h"
@@ skipping 241 matching lines @@
 
 static bool HasDominatingDef(Schedule* schedule, Node* node,
                              BasicBlock* container, BasicBlock* use_block,
                              int use_pos) {
   BasicBlock* block = use_block;
   while (true) {
     while (use_pos >= 0) {
       if (block->nodes_[use_pos] == node) return true;
       use_pos--;
     }
-    block = schedule->dominator(block);
+    block = block->dominator_;
     if (block == NULL) break;
     use_pos = static_cast<int>(block->nodes_.size()) - 1;
     if (node == block->control_input_) return true;
   }
   return false;
 }
 
 
 static void CheckInputsDominate(Schedule* schedule, BasicBlock* block,
                                 Node* node, int use_pos) {
@@ skipping 28 matching lines @@
   for (BasicBlockVector::iterator b = rpo_order->begin(); b != rpo_order->end();
        ++b) {
     CHECK_EQ((*b), schedule->GetBlockById((*b)->id()));
   }
 
   // Verify RPO numbers of blocks.
   CHECK_EQ(start, rpo_order->at(0));  // Start should be first.
   for (size_t b = 0; b < rpo_order->size(); b++) {
     BasicBlock* block = rpo_order->at(b);
     CHECK_EQ(static_cast<int>(b), block->rpo_number_);
-    BasicBlock* dom = schedule->dominator(block);
+    BasicBlock* dom = block->dominator_;
     if (b == 0) {
       // All blocks except start should have a dominator.
       CHECK_EQ(NULL, dom);
     } else {
       // Check that the immediate dominator appears somewhere before the block.
       CHECK_NE(NULL, dom);
       CHECK_LT(dom->rpo_number_, block->rpo_number_);
     }
   }
 
@@ skipping 36 matching lines @@
 
     // Compute a set of all the nodes that dominate a given node by using
     // a forward fixpoint. O(n^2).
     std::queue<BasicBlock*> queue;
     queue.push(start);
     dominators[start->id()] = new (zone) BitVector(count, zone);
     while (!queue.empty()) {
       BasicBlock* block = queue.front();
       queue.pop();
       BitVector* block_doms = dominators[block->id()];
-      BasicBlock* idom = schedule->dominator(block);
+      BasicBlock* idom = block->dominator_;
       if (idom != NULL && !block_doms->Contains(idom->id())) {
         V8_Fatal(__FILE__, __LINE__, "Block B%d is not dominated by B%d",
                  block->id(), idom->id());
       }
       for (int s = 0; s < block->SuccessorCount(); s++) {
         BasicBlock* succ = block->SuccessorAt(s);
         BitVector* succ_doms = dominators[succ->id()];
 
         if (succ_doms == NULL) {
-          // First time visiting the node. S.vec = B U B.vec
+          // First time visiting the node. S.doms = B U B.doms
           succ_doms = new (zone) BitVector(count, zone);
           succ_doms->CopyFrom(*block_doms);
           succ_doms->Add(block->id());
           dominators[succ->id()] = succ_doms;
           queue.push(succ);
         } else {
-          // Nth time visiting the successor. S.vec = S.vec ^ (B U B.vec)
+          // Nth time visiting the successor. S.doms = S.doms ^ (B U B.doms)
           bool had = succ_doms->Contains(block->id());
           if (had) succ_doms->Remove(block->id());
           if (succ_doms->IntersectIsChanged(*block_doms)) queue.push(succ);
           if (had) succ_doms->Add(block->id());
         }
       }
     }
 
     // Verify the immediateness of dominators.
     for (BasicBlockVector::iterator b = rpo_order->begin();
          b != rpo_order->end(); ++b) {
       BasicBlock* block = *b;
-      BasicBlock* idom = schedule->dominator(block);
+      BasicBlock* idom = block->dominator_;
       if (idom == NULL) continue;
       BitVector* block_doms = dominators[block->id()];
 
       for (BitVector::Iterator it(block_doms); !it.Done(); it.Advance()) {
         BasicBlock* dom = schedule->GetBlockById(it.Current());
         if (dom != idom && !dominators[idom->id()]->Contains(dom->id())) {
           V8_Fatal(__FILE__, __LINE__,
                    "Block B%d is not immediately dominated by B%d", block->id(),
                    idom->id());
         }
@@ skipping 34 matching lines @@
     // Check inputs for all nodes in the block.
     for (size_t i = 0; i < block->nodes_.size(); i++) {
       Node* node = block->nodes_[i];
       CheckInputsDominate(schedule, block, node, static_cast<int>(i) - 1);
     }
   }
 }
 }
 }
 }  // namespace v8::internal::compiler