| Index: src/arm/lithium-arm.cc
 | 
| diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc
 | 
| index e3d1997668b7ef4294925bdb1409ea5f9721c6e6..fa6ba1a6a83419b6a6b6e77598607c592bb86d4d 100644
 | 
| --- a/src/arm/lithium-arm.cc
 | 
| +++ b/src/arm/lithium-arm.cc
 | 
| @@ -815,11 +815,7 @@ 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);
 | 
| -      // TODO(mstarzinger): The length check below should actually not
 | 
| -      // be necessary, but some array stubs already rely on it. This
 | 
| -      // should be investigated and fixed.
 | 
| -      if (phi->HasMergedIndex() &&
 | 
| -          phi->merged_index() < last_environment->length()) {
 | 
| +      if (phi->HasMergedIndex()) {
 | 
|          last_environment->SetValueAt(phi->merged_index(), phi);
 | 
|        }
 | 
|      }
 | 
| 
 |