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

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

Issue 1113133006: Revert of Resolve references to "this" the same way as normal variables (Closed) Base URL: https://chromium.googlesource.com/v8/v8@master
Patch Set: 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/arm/full-codegen-arm.cc ('k') | src/arm64/full-codegen-arm64.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 #include "src/arm/lithium-codegen-arm.h" 7 #include "src/arm/lithium-codegen-arm.h"
8 #include "src/arm/lithium-gap-resolver-arm.h" 8 #include "src/arm/lithium-gap-resolver-arm.h"
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // r1: Callee's JS function. 114 // r1: Callee's JS function.
115 // cp: Callee's context. 115 // cp: Callee's context.
116 // pp: Callee's constant pool pointer (if FLAG_enable_ool_constant_pool) 116 // pp: Callee's constant pool pointer (if FLAG_enable_ool_constant_pool)
117 // fp: Caller's frame pointer. 117 // fp: Caller's frame pointer.
118 // lr: Caller's pc. 118 // lr: Caller's pc.
119 119
120 // Sloppy mode functions and builtins need to replace the receiver with the 120 // Sloppy mode functions and builtins need to replace the receiver with the
121 // global proxy when called as functions (without an explicit receiver 121 // global proxy when called as functions (without an explicit receiver
122 // object). 122 // object).
123 if (is_sloppy(info_->language_mode()) && info()->MayUseThis() && 123 if (is_sloppy(info_->language_mode()) && info()->MayUseThis() &&
124 !info_->is_native() && info_->scope()->has_this_declaration()) { 124 !info_->is_native()) {
125 Label ok; 125 Label ok;
126 int receiver_offset = info_->scope()->num_parameters() * kPointerSize; 126 int receiver_offset = info_->scope()->num_parameters() * kPointerSize;
127 __ ldr(r2, MemOperand(sp, receiver_offset)); 127 __ ldr(r2, MemOperand(sp, receiver_offset));
128 __ CompareRoot(r2, Heap::kUndefinedValueRootIndex); 128 __ CompareRoot(r2, Heap::kUndefinedValueRootIndex);
129 __ b(ne, &ok); 129 __ b(ne, &ok);
130 130
131 __ ldr(r2, GlobalObjectOperand()); 131 __ ldr(r2, GlobalObjectOperand());
132 __ ldr(r2, FieldMemOperand(r2, GlobalObject::kGlobalProxyOffset)); 132 __ ldr(r2, FieldMemOperand(r2, GlobalObject::kGlobalProxyOffset));
133 133
134 __ str(r2, MemOperand(sp, receiver_offset)); 134 __ str(r2, MemOperand(sp, receiver_offset));
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 __ push(r1); 190 __ push(r1);
191 __ CallRuntime(Runtime::kNewFunctionContext, 1); 191 __ CallRuntime(Runtime::kNewFunctionContext, 1);
192 } 192 }
193 RecordSafepoint(Safepoint::kNoLazyDeopt); 193 RecordSafepoint(Safepoint::kNoLazyDeopt);
194 // Context is returned in both r0 and cp. It replaces the context 194 // Context is returned in both r0 and cp. It replaces the context
195 // passed to us. It's saved in the stack and kept live in cp. 195 // passed to us. It's saved in the stack and kept live in cp.
196 __ mov(cp, r0); 196 __ mov(cp, r0);
197 __ str(r0, MemOperand(fp, StandardFrameConstants::kContextOffset)); 197 __ str(r0, MemOperand(fp, StandardFrameConstants::kContextOffset));
198 // Copy any necessary parameters into the context. 198 // Copy any necessary parameters into the context.
199 int num_parameters = scope()->num_parameters(); 199 int num_parameters = scope()->num_parameters();
200 int first_parameter = scope()->has_this_declaration() ? -1 : 0; 200 for (int i = 0; i < num_parameters; i++) {
201 for (int i = first_parameter; i < num_parameters; i++) { 201 Variable* var = scope()->parameter(i);
202 Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
203 if (var->IsContextSlot()) { 202 if (var->IsContextSlot()) {
204 int parameter_offset = StandardFrameConstants::kCallerSPOffset + 203 int parameter_offset = StandardFrameConstants::kCallerSPOffset +
205 (num_parameters - 1 - i) * kPointerSize; 204 (num_parameters - 1 - i) * kPointerSize;
206 // Load parameter from stack. 205 // Load parameter from stack.
207 __ ldr(r0, MemOperand(fp, parameter_offset)); 206 __ ldr(r0, MemOperand(fp, parameter_offset));
208 // Store it in the context. 207 // Store it in the context.
209 MemOperand target = ContextOperand(cp, var->index()); 208 MemOperand target = ContextOperand(cp, var->index());
210 __ str(r0, target); 209 __ str(r0, target);
211 // Update the write barrier. This clobbers r3 and r0. 210 // Update the write barrier. This clobbers r3 and r0.
212 if (need_write_barrier) { 211 if (need_write_barrier) {
(...skipping 5731 matching lines...) Expand 10 before | Expand all | Expand 10 after
5944 __ Push(scope_info); 5943 __ Push(scope_info);
5945 __ push(ToRegister(instr->function())); 5944 __ push(ToRegister(instr->function()));
5946 CallRuntime(Runtime::kPushBlockContext, 2, instr); 5945 CallRuntime(Runtime::kPushBlockContext, 2, instr);
5947 RecordSafepoint(Safepoint::kNoLazyDeopt); 5946 RecordSafepoint(Safepoint::kNoLazyDeopt);
5948 } 5947 }
5949 5948
5950 5949
5951 #undef __ 5950 #undef __
5952 5951
5953 } } // namespace v8::internal 5952 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/full-codegen-arm.cc ('k') | src/arm64/full-codegen-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698