| Index: src/compiler/frame-elider.cc
|
| diff --git a/src/compiler/frame-elider.cc b/src/compiler/frame-elider.cc
|
| index 7c3f9b2741ff3b0566bfc13065d26082425fe19b..172a724dd8a744dce535f47f96ec9f1342d3d4d1 100644
|
| --- a/src/compiler/frame-elider.cc
|
| +++ b/src/compiler/frame-elider.cc
|
| @@ -19,9 +19,9 @@ void FrameElider::Run() {
|
|
|
|
|
| void FrameElider::MarkBlocks() {
|
| - for (auto block : instruction_blocks()) {
|
| + for (InstructionBlock* block : instruction_blocks()) {
|
| if (block->needs_frame()) continue;
|
| - for (auto i = block->code_start(); i < block->code_end(); ++i) {
|
| + for (int i = block->code_start(); i < block->code_end(); ++i) {
|
| if (InstructionAt(i)->IsCall() ||
|
| InstructionAt(i)->opcode() == ArchOpcode::kArchDeoptimize) {
|
| block->mark_needs_frame();
|
| @@ -39,7 +39,7 @@ void FrameElider::PropagateMarks() {
|
|
|
|
|
| void FrameElider::MarkDeConstruction() {
|
| - for (auto block : instruction_blocks()) {
|
| + for (InstructionBlock* block : instruction_blocks()) {
|
| if (block->needs_frame()) {
|
| // Special case: The start block needs a frame.
|
| if (block->predecessors().empty()) {
|
| @@ -47,7 +47,7 @@ void FrameElider::MarkDeConstruction() {
|
| }
|
| // Find "frame -> no frame" transitions, inserting frame
|
| // deconstructions.
|
| - for (auto succ : block->successors()) {
|
| + for (RpoNumber& succ : block->successors()) {
|
| if (!InstructionBlockAt(succ)->needs_frame()) {
|
| DCHECK_EQ(1U, block->SuccessorCount());
|
| block->mark_must_deconstruct_frame();
|
| @@ -55,7 +55,7 @@ void FrameElider::MarkDeConstruction() {
|
| }
|
| } else {
|
| // Find "no frame -> frame" transitions, inserting frame constructions.
|
| - for (auto succ : block->successors()) {
|
| + for (RpoNumber& succ : block->successors()) {
|
| if (InstructionBlockAt(succ)->needs_frame()) {
|
| DCHECK_NE(1U, block->SuccessorCount());
|
| InstructionBlockAt(succ)->mark_must_construct_frame();
|
| @@ -68,7 +68,7 @@ void FrameElider::MarkDeConstruction() {
|
|
|
| bool FrameElider::PropagateInOrder() {
|
| bool changed = false;
|
| - for (auto block : instruction_blocks()) {
|
| + for (InstructionBlock* block : instruction_blocks()) {
|
| changed |= PropagateIntoBlock(block);
|
| }
|
| return changed;
|
| @@ -77,7 +77,7 @@ bool FrameElider::PropagateInOrder() {
|
|
|
| bool FrameElider::PropagateReversed() {
|
| bool changed = false;
|
| - for (auto block : base::Reversed(instruction_blocks())) {
|
| + for (InstructionBlock* block : base::Reversed(instruction_blocks())) {
|
| changed |= PropagateIntoBlock(block);
|
| }
|
| return changed;
|
| @@ -94,7 +94,7 @@ bool FrameElider::PropagateIntoBlock(InstructionBlock* block) {
|
|
|
| // Propagate towards the end ("downwards") if there is a predecessor needing
|
| // a frame, but don't "bleed" from deferred code to non-deferred code.
|
| - for (auto pred : block->predecessors()) {
|
| + for (RpoNumber& pred : block->predecessors()) {
|
| if (InstructionBlockAt(pred)->needs_frame() &&
|
| (!InstructionBlockAt(pred)->IsDeferred() || block->IsDeferred())) {
|
| block->mark_needs_frame();
|
| @@ -104,7 +104,7 @@ bool FrameElider::PropagateIntoBlock(InstructionBlock* block) {
|
|
|
| // Propagate towards start ("upwards") if there are successors and all of
|
| // them need a frame.
|
| - for (auto succ : block->successors()) {
|
| + for (RpoNumber& succ : block->successors()) {
|
| if (!InstructionBlockAt(succ)->needs_frame()) return false;
|
| }
|
| block->mark_needs_frame();
|
|
|