Index: src/x64/lithium-x64.cc |
diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc |
index 96fa71954e59a75591937e448f7e9f7da79d2317..31a06df0820cdf375c8fc6f0a1a6186e5c189355 100644 |
--- a/src/x64/lithium-x64.cc |
+++ b/src/x64/lithium-x64.cc |
@@ -2374,8 +2374,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; |
@@ -2423,20 +2422,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. |