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

Side by Side Diff: src/x64/lithium-codegen-x64.cc

Issue 883823002: Implement proper scoping for "this" in arrow functions Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebased against master, plus fixes. Only 4 tests failing (+2 in TurboFan) Created 5 years, 9 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/x64/full-codegen-x64.cc ('k') | test/mjsunit/debug-scopes.js » ('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 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_X64 7 #if V8_TARGET_ARCH_X64
8 8
9 #include "src/base/bits.h" 9 #include "src/base/bits.h"
10 #include "src/code-factory.h" 10 #include "src/code-factory.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #ifdef DEBUG 123 #ifdef DEBUG
124 if (strlen(FLAG_stop_at) > 0 && 124 if (strlen(FLAG_stop_at) > 0 &&
125 info_->function()->name()->IsUtf8EqualTo(CStrVector(FLAG_stop_at))) { 125 info_->function()->name()->IsUtf8EqualTo(CStrVector(FLAG_stop_at))) {
126 __ int3(); 126 __ int3();
127 } 127 }
128 #endif 128 #endif
129 129
130 // Sloppy mode functions need to replace the receiver with the global proxy 130 // Sloppy mode functions need to replace the receiver with the global proxy
131 // when called as functions (without an explicit receiver object). 131 // when called as functions (without an explicit receiver object).
132 if (info_->this_has_uses() && is_sloppy(info_->language_mode()) && 132 if (info_->this_has_uses() && is_sloppy(info_->language_mode()) &&
133 !info_->is_native()) { 133 !info_->is_native() && info_->scope()->has_this_declaration()) {
134 Label ok; 134 Label ok;
135 StackArgumentsAccessor args(rsp, scope()->num_parameters()); 135 StackArgumentsAccessor args(rsp, scope()->num_parameters());
136 __ movp(rcx, args.GetReceiverOperand()); 136 __ movp(rcx, args.GetReceiverOperand());
137 137
138 __ CompareRoot(rcx, Heap::kUndefinedValueRootIndex); 138 __ CompareRoot(rcx, Heap::kUndefinedValueRootIndex);
139 __ j(not_equal, &ok, Label::kNear); 139 __ j(not_equal, &ok, Label::kNear);
140 140
141 __ movp(rcx, GlobalObjectOperand()); 141 __ movp(rcx, GlobalObjectOperand());
142 __ movp(rcx, FieldOperand(rcx, GlobalObject::kGlobalProxyOffset)); 142 __ movp(rcx, FieldOperand(rcx, GlobalObject::kGlobalProxyOffset));
143 143
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 __ CallRuntime(Runtime::kNewFunctionContext, 1); 205 __ CallRuntime(Runtime::kNewFunctionContext, 1);
206 } 206 }
207 RecordSafepoint(Safepoint::kNoLazyDeopt); 207 RecordSafepoint(Safepoint::kNoLazyDeopt);
208 // Context is returned in rax. It replaces the context passed to us. 208 // Context is returned in rax. It replaces the context passed to us.
209 // It's saved in the stack and kept live in rsi. 209 // It's saved in the stack and kept live in rsi.
210 __ movp(rsi, rax); 210 __ movp(rsi, rax);
211 __ movp(Operand(rbp, StandardFrameConstants::kContextOffset), rax); 211 __ movp(Operand(rbp, StandardFrameConstants::kContextOffset), rax);
212 212
213 // Copy any necessary parameters into the context. 213 // Copy any necessary parameters into the context.
214 int num_parameters = scope()->num_parameters(); 214 int num_parameters = scope()->num_parameters();
215 for (int i = 0; i < num_parameters; i++) { 215 int first_parameter = scope()->has_this_declaration() ? -1 : 0;
216 Variable* var = scope()->parameter(i); 216 for (int i = first_parameter; i < num_parameters; i++) {
217 Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
217 if (var->IsContextSlot()) { 218 if (var->IsContextSlot()) {
218 int parameter_offset = StandardFrameConstants::kCallerSPOffset + 219 int parameter_offset = StandardFrameConstants::kCallerSPOffset +
219 (num_parameters - 1 - i) * kPointerSize; 220 (num_parameters - 1 - i) * kPointerSize;
220 // Load parameter from stack. 221 // Load parameter from stack.
221 __ movp(rax, Operand(rbp, parameter_offset)); 222 __ movp(rax, Operand(rbp, parameter_offset));
222 // Store it in the context. 223 // Store it in the context.
223 int context_offset = Context::SlotOffset(var->index()); 224 int context_offset = Context::SlotOffset(var->index());
224 __ movp(Operand(rsi, context_offset), rax); 225 __ movp(Operand(rsi, context_offset), rax);
225 // Update the write barrier. This clobbers rax and rbx. 226 // Update the write barrier. This clobbers rax and rbx.
226 if (need_write_barrier) { 227 if (need_write_barrier) {
(...skipping 5709 matching lines...) Expand 10 before | Expand all | Expand 10 after
5936 CallRuntime(Runtime::kPushBlockContext, 2, instr); 5937 CallRuntime(Runtime::kPushBlockContext, 2, instr);
5937 RecordSafepoint(Safepoint::kNoLazyDeopt); 5938 RecordSafepoint(Safepoint::kNoLazyDeopt);
5938 } 5939 }
5939 5940
5940 5941
5941 #undef __ 5942 #undef __
5942 5943
5943 } } // namespace v8::internal 5944 } } // namespace v8::internal
5944 5945
5945 #endif // V8_TARGET_ARCH_X64 5946 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/full-codegen-x64.cc ('k') | test/mjsunit/debug-scopes.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698