|
5 | 5 | #include "src/crankshaft/hydrogen-gvn.h"
|
6 | 6 |
|
7 | 7 | #include "src/crankshaft/hydrogen.h"
|
| 8 | +#include "src/list.h" |
| 9 | +#include "src/list-inl.h" |
8 | 10 | #include "src/objects-inl.h"
|
9 | 11 | #include "src/v8.h"
|
10 | 12 |
|
@@ -651,19 +653,23 @@ SideEffects
|
651 | 653 | HGlobalValueNumberingPhase::CollectSideEffectsOnPathsToDominatedBlock(
|
652 | 654 | HBasicBlock* dominator, HBasicBlock* dominated) {
|
653 | 655 | SideEffects side_effects;
|
654 |
| - for (int i = 0; i < dominated->predecessors()->length(); ++i) { |
655 |
| - HBasicBlock* block = dominated->predecessors()->at(i); |
656 |
| - if (dominator->block_id() < block->block_id() && |
657 |
| - block->block_id() < dominated->block_id() && |
658 |
| - !visited_on_paths_.Contains(block->block_id())) { |
659 |
| - visited_on_paths_.Add(block->block_id()); |
660 |
| - side_effects.Add(block_side_effects_[block->block_id()]); |
661 |
| - if (block->IsLoopHeader()) { |
662 |
| - side_effects.Add(loop_side_effects_[block->block_id()]); |
| 656 | + List<HBasicBlock*> blocks; |
| 657 | + for (;;) { |
| 658 | + for (int i = 0; i < dominated->predecessors()->length(); ++i) { |
| 659 | + HBasicBlock* block = dominated->predecessors()->at(i); |
| 660 | + if (dominator->block_id() < block->block_id() && |
| 661 | + block->block_id() < dominated->block_id() && |
| 662 | + !visited_on_paths_.Contains(block->block_id())) { |
| 663 | + visited_on_paths_.Add(block->block_id()); |
| 664 | + side_effects.Add(block_side_effects_[block->block_id()]); |
| 665 | + if (block->IsLoopHeader()) { |
| 666 | + side_effects.Add(loop_side_effects_[block->block_id()]); |
| 667 | + } |
| 668 | + blocks.Add(block); |
663 | 669 | }
|
664 |
| - side_effects.Add(CollectSideEffectsOnPathsToDominatedBlock( |
665 |
| - dominator, block)); |
666 | 670 | }
|
| 671 | + if (blocks.is_empty()) break; |
| 672 | + dominated = blocks.RemoveLast(); |
667 | 673 | }
|
668 | 674 | return side_effects;
|
669 | 675 | }
|
|
0 commit comments