| Index: src/ia32/full-codegen-ia32.cc
|
| diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
|
| index dc3d403044c2e7db2edc4d57ff5965c60fc6e8ec..4b75e21641134941fdd23ee7b899ef545ec8e563 100644
|
| --- a/src/ia32/full-codegen-ia32.cc
|
| +++ b/src/ia32/full-codegen-ia32.cc
|
| @@ -209,8 +209,9 @@ void FullCodeGenerator::Generate() {
|
|
|
| // Copy parameters into context if necessary.
|
| int num_parameters = info->scope()->num_parameters();
|
| - for (int i = 0; i < num_parameters; i++) {
|
| - Variable* var = scope()->parameter(i);
|
| + int first_parameter = info->scope()->has_this_declaration() ? -1 : 0;
|
| + for (int i = first_parameter; i < num_parameters; i++) {
|
| + Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
|
| if (var->IsContextSlot()) {
|
| int parameter_offset = StandardFrameConstants::kCallerSPOffset +
|
| (num_parameters - 1 - i) * kPointerSize;
|
| @@ -2989,7 +2990,9 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
| // Push the enclosing function.
|
| __ push(Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
|
| // Push the receiver of the enclosing function.
|
| - __ push(Operand(ebp, (2 + info_->scope()->num_parameters()) * kPointerSize));
|
| + Variable* this_var = scope()->LookupThis();
|
| + DCHECK_NOT_NULL(this_var);
|
| + __ push(VarOperand(this_var, ecx));
|
| // Push the language mode.
|
| __ push(Immediate(Smi::FromInt(language_mode())));
|
|
|
|
|