| Index: src/arm64/full-codegen-arm64.cc
|
| diff --git a/src/arm64/full-codegen-arm64.cc b/src/arm64/full-codegen-arm64.cc
|
| index af4a6d647d9f3e2d54900a6c863078ab16368888..b94d66446684ed1d44841cf072db846ae2224aab 100644
|
| --- a/src/arm64/full-codegen-arm64.cc
|
| +++ b/src/arm64/full-codegen-arm64.cc
|
| @@ -125,7 +125,7 @@ void FullCodeGenerator::Generate() {
|
| // global proxy when called as functions (without an explicit receiver
|
| // object).
|
| if (is_sloppy(info->language_mode()) && !info->is_native() &&
|
| - info->MayUseThis()) {
|
| + info->MayUseThis() && info->scope()->has_this_declaration()) {
|
| Label ok;
|
| int receiver_offset = info->scope()->num_parameters() * kXRegSize;
|
| __ Peek(x10, receiver_offset);
|
| @@ -217,8 +217,9 @@ void FullCodeGenerator::Generate() {
|
| __ Str(x0, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| // Copy any necessary parameters into the context.
|
| 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;
|
| @@ -2751,8 +2752,9 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
|
|
| __ Ldr(x10, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| // Prepare to push the receiver of the enclosing function.
|
| - int receiver_offset = 2 + info_->scope()->num_parameters();
|
| - __ Ldr(x11, MemOperand(fp, receiver_offset * kPointerSize));
|
| + Variable* this_var = scope()->LookupThis();
|
| + DCHECK_NOT_NULL(this_var);
|
| + __ Ldr(x11, VarOperand(this_var, x11));
|
|
|
| // Prepare to push the language mode.
|
| __ Mov(x12, Smi::FromInt(language_mode()));
|
|
|