| Index: src/compiler/verifier.cc
|
| diff --git a/src/compiler/verifier.cc b/src/compiler/verifier.cc
|
| index 9b06e3140eab4c6af39b54dddbffc00ce8bb6ac7..eebd404d042e3d18e336693d02b8accb4e159537 100644
|
| --- a/src/compiler/verifier.cc
|
| +++ b/src/compiler/verifier.cc
|
| @@ -259,7 +259,7 @@ static bool HasDominatingDef(Schedule* schedule, Node* node,
|
| 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;
|
| @@ -308,7 +308,7 @@ void ScheduleVerifier::Run(Schedule* schedule) {
|
| 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);
|
| @@ -365,7 +365,7 @@ void ScheduleVerifier::Run(Schedule* schedule) {
|
| 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());
|
| @@ -375,14 +375,14 @@ void ScheduleVerifier::Run(Schedule* schedule) {
|
| 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);
|
| @@ -395,7 +395,7 @@ void ScheduleVerifier::Run(Schedule* schedule) {
|
| 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()];
|
|
|
|
|