Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index cdc1947d4e16bfd969987bed0442da731eb05ead..f48e08efcbca5e345428fa08a677e4b7713df0b9 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -1077,7 +1077,8 @@ LInstruction* LChunkBuilder::DoArgumentsLength(HArgumentsLength* instr) { |
LInstruction* LChunkBuilder::DoArgumentsElements(HArgumentsElements* elems) { |
- return DefineAsRegister(new(zone()) LArgumentsElements); |
+ return DefineAsRegister(new(zone()) LArgumentsElements( |
+ current_block_->last_environment()->outer() != NULL)); |
} |
@@ -2271,6 +2272,9 @@ LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
undefined, |
instr->call_kind(), |
instr->is_construct()); |
+ if (instr->materializes_arguments()) { |
+ inner->Bind(instr->arguments(), graph()->GetArgumentsObject()); |
+ } |
current_block_->UpdateEnvironment(inner); |
chunk_->AddInlinedClosure(instr->closure()); |
return NULL; |
@@ -2278,10 +2282,21 @@ LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
+ LInstruction* pop = NULL; |
+ |
+ HEnvironment* env = current_block_->last_environment(); |
+ |
+ if (instr->arguments_pushed()) { |
+ int argument_count = env->arguments_environment()->parameter_count(); |
+ pop = new(zone()) LPop(argument_count); |
+ argument_count_ -= argument_count; |
+ } |
+ |
HEnvironment* outer = current_block_->last_environment()-> |
DiscardInlined(false); |
current_block_->UpdateEnvironment(outer); |
- return NULL; |
+ |
+ return pop; |
} |