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

Side by Side Diff: src/x64/full-codegen-x64.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: Rebase and fix nits 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
« no previous file with comments | « src/variables.cc ('k') | src/x64/lithium-codegen-x64.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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_X64 7 #if V8_TARGET_ARCH_X64
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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 if (strlen(FLAG_stop_at) > 0 && 108 if (strlen(FLAG_stop_at) > 0 &&
109 info->function()->name()->IsUtf8EqualTo(CStrVector(FLAG_stop_at))) { 109 info->function()->name()->IsUtf8EqualTo(CStrVector(FLAG_stop_at))) {
110 __ int3(); 110 __ int3();
111 } 111 }
112 #endif 112 #endif
113 113
114 // Sloppy mode functions and builtins need to replace the receiver with the 114 // Sloppy mode functions and builtins need to replace the receiver with the
115 // global proxy when called as functions (without an explicit receiver 115 // global proxy when called as functions (without an explicit receiver
116 // object). 116 // object).
117 if (is_sloppy(info->language_mode()) && !info->is_native() && 117 if (is_sloppy(info->language_mode()) && !info->is_native() &&
118 info->MayUseThis()) { 118 info->MayUseThis() && info->scope()->has_this_declaration()) {
119 Label ok; 119 Label ok;
120 // +1 for return address. 120 // +1 for return address.
121 StackArgumentsAccessor args(rsp, info->scope()->num_parameters()); 121 StackArgumentsAccessor args(rsp, info->scope()->num_parameters());
122 __ movp(rcx, args.GetReceiverOperand()); 122 __ movp(rcx, args.GetReceiverOperand());
123 123
124 __ CompareRoot(rcx, Heap::kUndefinedValueRootIndex); 124 __ CompareRoot(rcx, Heap::kUndefinedValueRootIndex);
125 __ j(not_equal, &ok, Label::kNear); 125 __ j(not_equal, &ok, Label::kNear);
126 126
127 __ movp(rcx, GlobalObjectOperand()); 127 __ movp(rcx, GlobalObjectOperand());
128 __ movp(rcx, FieldOperand(rcx, GlobalObject::kGlobalProxyOffset)); 128 __ movp(rcx, FieldOperand(rcx, GlobalObject::kGlobalProxyOffset));
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 __ CallRuntime(Runtime::kNewFunctionContext, 1); 202 __ CallRuntime(Runtime::kNewFunctionContext, 1);
203 } 203 }
204 function_in_register = false; 204 function_in_register = false;
205 // Context is returned in rax. It replaces the context passed to us. 205 // Context is returned in rax. It replaces the context passed to us.
206 // It's saved in the stack and kept live in rsi. 206 // It's saved in the stack and kept live in rsi.
207 __ movp(rsi, rax); 207 __ movp(rsi, rax);
208 __ movp(Operand(rbp, StandardFrameConstants::kContextOffset), rax); 208 __ movp(Operand(rbp, StandardFrameConstants::kContextOffset), rax);
209 209
210 // Copy any necessary parameters into the context. 210 // Copy any necessary parameters into the context.
211 int num_parameters = info->scope()->num_parameters(); 211 int num_parameters = info->scope()->num_parameters();
212 for (int i = 0; i < num_parameters; i++) { 212 int first_parameter = info->scope()->has_this_declaration() ? -1 : 0;
213 Variable* var = scope()->parameter(i); 213 for (int i = first_parameter; i < num_parameters; i++) {
214 Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
214 if (var->IsContextSlot()) { 215 if (var->IsContextSlot()) {
215 int parameter_offset = StandardFrameConstants::kCallerSPOffset + 216 int parameter_offset = StandardFrameConstants::kCallerSPOffset +
216 (num_parameters - 1 - i) * kPointerSize; 217 (num_parameters - 1 - i) * kPointerSize;
217 // Load parameter from stack. 218 // Load parameter from stack.
218 __ movp(rax, Operand(rbp, parameter_offset)); 219 __ movp(rax, Operand(rbp, parameter_offset));
219 // Store it in the context. 220 // Store it in the context.
220 int context_offset = Context::SlotOffset(var->index()); 221 int context_offset = Context::SlotOffset(var->index());
221 __ movp(Operand(rsi, context_offset), rax); 222 __ movp(Operand(rsi, context_offset), rax);
222 // Update the write barrier. This clobbers rax and rbx. 223 // Update the write barrier. This clobbers rax and rbx.
223 if (need_write_barrier) { 224 if (need_write_barrier) {
(...skipping 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2953 if (arg_count > 0) { 2954 if (arg_count > 0) {
2954 __ Push(Operand(rsp, arg_count * kPointerSize)); 2955 __ Push(Operand(rsp, arg_count * kPointerSize));
2955 } else { 2956 } else {
2956 __ PushRoot(Heap::kUndefinedValueRootIndex); 2957 __ PushRoot(Heap::kUndefinedValueRootIndex);
2957 } 2958 }
2958 2959
2959 // Push the enclosing function. 2960 // Push the enclosing function.
2960 __ Push(Operand(rbp, JavaScriptFrameConstants::kFunctionOffset)); 2961 __ Push(Operand(rbp, JavaScriptFrameConstants::kFunctionOffset));
2961 2962
2962 // Push the receiver of the enclosing function and do runtime call. 2963 // Push the receiver of the enclosing function and do runtime call.
2963 StackArgumentsAccessor args(rbp, info_->scope()->num_parameters()); 2964 Variable* this_var = scope()->LookupThis();
2964 __ Push(args.GetReceiverOperand()); 2965 DCHECK_NOT_NULL(this_var);
2966 __ Push(VarOperand(this_var, kScratchRegister));
2965 2967
2966 // Push the language mode. 2968 // Push the language mode.
2967 __ Push(Smi::FromInt(language_mode())); 2969 __ Push(Smi::FromInt(language_mode()));
2968 2970
2969 // Push the start position of the scope the calls resides in. 2971 // Push the start position of the scope the calls resides in.
2970 __ Push(Smi::FromInt(scope()->start_position())); 2972 __ Push(Smi::FromInt(scope()->start_position()));
2971 2973
2972 // Do the runtime call. 2974 // Do the runtime call.
2973 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 6); 2975 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 6);
2974 } 2976 }
(...skipping 2414 matching lines...) Expand 10 before | Expand all | Expand 10 after
5389 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(), 5391 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(),
5390 Assembler::target_address_at(call_target_address, 5392 Assembler::target_address_at(call_target_address,
5391 unoptimized_code)); 5393 unoptimized_code));
5392 return OSR_AFTER_STACK_CHECK; 5394 return OSR_AFTER_STACK_CHECK;
5393 } 5395 }
5394 5396
5395 5397
5396 } } // namespace v8::internal 5398 } } // namespace v8::internal
5397 5399
5398 #endif // V8_TARGET_ARCH_X64 5400 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/variables.cc ('k') | src/x64/lithium-codegen-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698