| Index: src/ia32/lithium-ia32.cc
|
| diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
|
| index 7bb864fae59b5c3b20b3c0a64ddd1e860c291a3a..acfa6d46059804656dc4b4c505c773c0063dd057 100644
|
| --- a/src/ia32/lithium-ia32.cc
|
| +++ b/src/ia32/lithium-ia32.cc
|
| @@ -1083,7 +1083,8 @@ LInstruction* LChunkBuilder::DoArgumentsLength(HArgumentsLength* length) {
|
|
|
|
|
| LInstruction* LChunkBuilder::DoArgumentsElements(HArgumentsElements* elems) {
|
| - return DefineAsRegister(new(zone()) LArgumentsElements);
|
| + return DefineAsRegister(new(zone()) LArgumentsElements(
|
| + current_block_->last_environment()->outer() != NULL));
|
| }
|
|
|
|
|
| @@ -2380,8 +2381,8 @@ LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) {
|
| undefined,
|
| instr->call_kind(),
|
| instr->is_construct());
|
| - if (instr->arguments() != NULL) {
|
| - inner->Bind(instr->arguments(), graph()->GetArgumentsObject());
|
| + if (instr->arguments_var() != NULL) {
|
| + inner->Bind(instr->arguments_var(), graph()->GetArgumentsObject());
|
| }
|
| current_block_->UpdateEnvironment(inner);
|
| chunk_->AddInlinedClosure(instr->closure());
|
| @@ -2390,10 +2391,20 @@ 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;
|
| }
|
|
|
|
|
|
|