| Index: src/ia32/lithium-ia32.cc
|
| diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
|
| index aa1d5c91c1a1cf749be75d14331489c75e90dc10..c4a8be1bccaeeb615eb955f3f6dbb807a012aef2 100644
|
| --- a/src/ia32/lithium-ia32.cc
|
| +++ b/src/ia32/lithium-ia32.cc
|
| @@ -884,11 +884,15 @@ void LChunkBuilder::DoBasicBlock(HBasicBlock* block, HBasicBlock* next_block) {
|
| HEnvironment* last_environment = pred->last_environment();
|
| for (int i = 0; i < block->phis()->length(); ++i) {
|
| HPhi* phi = block->phis()->at(i);
|
| - last_environment->SetValueAt(phi->merged_index(), phi);
|
| + if (phi->merged_index() < last_environment->length()) {
|
| + last_environment->SetValueAt(phi->merged_index(), phi);
|
| + }
|
| }
|
| for (int i = 0; i < block->deleted_phis()->length(); ++i) {
|
| - last_environment->SetValueAt(block->deleted_phis()->at(i),
|
| - graph_->GetConstantUndefined());
|
| + if (block->deleted_phis()->at(i) < last_environment->length()) {
|
| + last_environment->SetValueAt(block->deleted_phis()->at(i),
|
| + graph_->GetConstantUndefined());
|
| + }
|
| }
|
| block->UpdateEnvironment(last_environment);
|
| // Pick up the outgoing argument count of one of the predecessors.
|
|
|