Index: src/compiler/move-optimizer.cc |
diff --git a/src/compiler/move-optimizer.cc b/src/compiler/move-optimizer.cc |
index e99b5e9ebe4024bb85ac2bf34b220d6e8fdab6fc..8562410443f0b85f391886a320a65c90b4a1a726 100644 |
--- a/src/compiler/move-optimizer.cc |
+++ b/src/compiler/move-optimizer.cc |
@@ -91,22 +91,25 @@ MoveOptimizer::MoveOptimizer(Zone* local_zone, InstructionSequence* code) |
void MoveOptimizer::Run() { |
- for (auto* block : code()->instruction_blocks()) { |
+ for (InstructionBlock* block : code()->instruction_blocks()) { |
CompressBlock(block); |
} |
- for (auto block : code()->instruction_blocks()) { |
+ for (InstructionBlock* block : code()->instruction_blocks()) { |
if (block->PredecessorCount() <= 1) continue; |
- bool has_only_deferred = true; |
- for (RpoNumber pred_id : block->predecessors()) { |
- if (!code()->InstructionBlockAt(pred_id)->IsDeferred()) { |
- has_only_deferred = false; |
- break; |
+ if (!block->IsDeferred()) { |
+ bool has_only_deferred = true; |
+ for (RpoNumber pred_id : block->predecessors()) { |
+ if (!code()->InstructionBlockAt(pred_id)->IsDeferred()) { |
+ has_only_deferred = false; |
+ break; |
+ } |
} |
+ // This would pull down common moves. If the moves occur in deferred |
+ // blocks, and the closest common successor is not deferred, we lose the |
+ // optimization of just spilling/filling in deferred blocks, when the |
+ // current block is not deferred. |
+ if (has_only_deferred) continue; |
} |
- // This would pull down common moves. If the moves occur in deferred blocks, |
- // and the closest common successor is not deferred, we lose the |
- // optimization of just spilling/filling in deferred blocks. |
- if (has_only_deferred) continue; |
OptimizeMerge(block); |
} |
for (auto gap : to_finalize_) { |