Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index 7c02a62c46f5ae21842edf1e6033d84afeaa5dd1..4ecea705cfd1f40359bb34a1a849d1a7297de32e 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -2435,8 +2435,7 @@ LInstruction* LChunkBuilder::DoArgumentsObject(HArgumentsObject* instr) { |
LInstruction* LChunkBuilder::DoCapturedObject(HCapturedObject* instr) { |
- HEnvironment* env = current_block_->last_environment(); |
- instr->ReplayEnvironment(env); |
+ instr->ReplayEnvironment(current_block_->last_environment()); |
// There are no real uses of a captured object. |
return NULL; |
@@ -2484,20 +2483,7 @@ LInstruction* LChunkBuilder::DoIsConstructCallAndBranch( |
LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) { |
- HEnvironment* env = current_block_->last_environment(); |
- ASSERT(env != NULL); |
- |
- env->set_ast_id(instr->ast_id()); |
- |
- env->Drop(instr->pop_count()); |
- for (int i = instr->values()->length() - 1; i >= 0; --i) { |
- HValue* value = instr->values()->at(i); |
- if (instr->HasAssignedIndexAt(i)) { |
- env->Bind(instr->GetAssignedIndexAt(i), value); |
- } else { |
- env->Push(value); |
- } |
- } |
+ instr->ReplayEnvironment(current_block_->last_environment()); |
// If there is an instruction pending deoptimization environment create a |
// lazy bailout instruction to capture the environment. |