Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Side by Side Diff: src/arm64/full-codegen-arm64.cc

Issue 1097283003: Resolve references to "this" the same way as normal variables (Closed) Base URL: https://chromium.googlesource.com/v8/v8@master
Patch Set: Add TODO to fix fat-fingered "this" scoping in script context Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #if V8_TARGET_ARCH_ARM64 7 #if V8_TARGET_ARCH_ARM64
8 8
9 #include "src/code-factory.h" 9 #include "src/code-factory.h"
10 #include "src/code-stubs.h" 10 #include "src/code-stubs.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 #ifdef DEBUG 117 #ifdef DEBUG
118 if (strlen(FLAG_stop_at) > 0 && 118 if (strlen(FLAG_stop_at) > 0 &&
119 info->function()->name()->IsUtf8EqualTo(CStrVector(FLAG_stop_at))) { 119 info->function()->name()->IsUtf8EqualTo(CStrVector(FLAG_stop_at))) {
120 __ Debug("stop-at", __LINE__, BREAK); 120 __ Debug("stop-at", __LINE__, BREAK);
121 } 121 }
122 #endif 122 #endif
123 123
124 // Sloppy mode functions and builtins need to replace the receiver with the 124 // Sloppy mode functions and builtins need to replace the receiver with the
125 // global proxy when called as functions (without an explicit receiver 125 // global proxy when called as functions (without an explicit receiver
126 // object). 126 // object).
127 if (is_sloppy(info->language_mode()) && !info->is_native()) { 127 if (is_sloppy(info->language_mode()) && !info->is_native() &&
128 info->scope()->has_this_declaration()) {
128 Label ok; 129 Label ok;
129 int receiver_offset = info->scope()->num_parameters() * kXRegSize; 130 int receiver_offset = info->scope()->num_parameters() * kXRegSize;
130 __ Peek(x10, receiver_offset); 131 __ Peek(x10, receiver_offset);
131 __ JumpIfNotRoot(x10, Heap::kUndefinedValueRootIndex, &ok); 132 __ JumpIfNotRoot(x10, Heap::kUndefinedValueRootIndex, &ok);
132 133
133 __ Ldr(x10, GlobalObjectMemOperand()); 134 __ Ldr(x10, GlobalObjectMemOperand());
134 __ Ldr(x10, FieldMemOperand(x10, GlobalObject::kGlobalProxyOffset)); 135 __ Ldr(x10, FieldMemOperand(x10, GlobalObject::kGlobalProxyOffset));
135 __ Poke(x10, receiver_offset); 136 __ Poke(x10, receiver_offset);
136 137
137 __ Bind(&ok); 138 __ Bind(&ok);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 __ Push(x1); 210 __ Push(x1);
210 __ CallRuntime(Runtime::kNewFunctionContext, 1); 211 __ CallRuntime(Runtime::kNewFunctionContext, 1);
211 } 212 }
212 function_in_register_x1 = false; 213 function_in_register_x1 = false;
213 // Context is returned in x0. It replaces the context passed to us. 214 // Context is returned in x0. It replaces the context passed to us.
214 // It's saved in the stack and kept live in cp. 215 // It's saved in the stack and kept live in cp.
215 __ Mov(cp, x0); 216 __ Mov(cp, x0);
216 __ Str(x0, MemOperand(fp, StandardFrameConstants::kContextOffset)); 217 __ Str(x0, MemOperand(fp, StandardFrameConstants::kContextOffset));
217 // Copy any necessary parameters into the context. 218 // Copy any necessary parameters into the context.
218 int num_parameters = info->scope()->num_parameters(); 219 int num_parameters = info->scope()->num_parameters();
219 for (int i = 0; i < num_parameters; i++) { 220 int first_parameter = info->scope()->has_this_declaration() ? -1 : 0;
220 Variable* var = scope()->parameter(i); 221 for (int i = first_parameter; i < num_parameters; i++) {
222 Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
221 if (var->IsContextSlot()) { 223 if (var->IsContextSlot()) {
222 int parameter_offset = StandardFrameConstants::kCallerSPOffset + 224 int parameter_offset = StandardFrameConstants::kCallerSPOffset +
223 (num_parameters - 1 - i) * kPointerSize; 225 (num_parameters - 1 - i) * kPointerSize;
224 // Load parameter from stack. 226 // Load parameter from stack.
225 __ Ldr(x10, MemOperand(fp, parameter_offset)); 227 __ Ldr(x10, MemOperand(fp, parameter_offset));
226 // Store it in the context. 228 // Store it in the context.
227 MemOperand target = ContextMemOperand(cp, var->index()); 229 MemOperand target = ContextMemOperand(cp, var->index());
228 __ Str(x10, target); 230 __ Str(x10, target);
229 231
230 // Update the write barrier. 232 // Update the write barrier.
(...skipping 2544 matching lines...) Expand 10 before | Expand all | Expand 10 after
2775 // Prepare to push a copy of the first argument or undefined if it doesn't 2777 // Prepare to push a copy of the first argument or undefined if it doesn't
2776 // exist. 2778 // exist.
2777 if (arg_count > 0) { 2779 if (arg_count > 0) {
2778 __ Peek(x9, arg_count * kXRegSize); 2780 __ Peek(x9, arg_count * kXRegSize);
2779 } else { 2781 } else {
2780 __ LoadRoot(x9, Heap::kUndefinedValueRootIndex); 2782 __ LoadRoot(x9, Heap::kUndefinedValueRootIndex);
2781 } 2783 }
2782 2784
2783 __ Ldr(x10, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); 2785 __ Ldr(x10, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
2784 // Prepare to push the receiver of the enclosing function. 2786 // Prepare to push the receiver of the enclosing function.
2785 int receiver_offset = 2 + info_->scope()->num_parameters(); 2787 Variable* this_var = scope()->LookupThis();
2786 __ Ldr(x11, MemOperand(fp, receiver_offset * kPointerSize)); 2788 DCHECK_NOT_NULL(this_var);
2789 __ Ldr(x11, VarOperand(this_var, x11));
2787 2790
2788 // Prepare to push the language mode. 2791 // Prepare to push the language mode.
2789 __ Mov(x12, Smi::FromInt(language_mode())); 2792 __ Mov(x12, Smi::FromInt(language_mode()));
2790 // Prepare to push the start position of the scope the calls resides in. 2793 // Prepare to push the start position of the scope the calls resides in.
2791 __ Mov(x13, Smi::FromInt(scope()->start_position())); 2794 __ Mov(x13, Smi::FromInt(scope()->start_position()));
2792 2795
2793 // Push. 2796 // Push.
2794 __ Push(x9, x10, x11, x12, x13); 2797 __ Push(x9, x10, x11, x12, x13);
2795 2798
2796 // Do the runtime call. 2799 // Do the runtime call.
(...skipping 2712 matching lines...) Expand 10 before | Expand all | Expand 10 after
5509 } 5512 }
5510 } 5513 }
5511 5514
5512 return INTERRUPT; 5515 return INTERRUPT;
5513 } 5516 }
5514 5517
5515 5518
5516 } } // namespace v8::internal 5519 } } // namespace v8::internal
5517 5520
5518 #endif // V8_TARGET_ARCH_ARM64 5521 #endif // V8_TARGET_ARCH_ARM64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698