Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 90eb4f74cf9a542071186592165522a1dde24e9a..a5707c30a18aa1fd7e3d9a7aed36218028720276 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -121,7 +121,7 @@ bool LCodeGen::GeneratePrologue() { |
// global proxy when called as functions (without an explicit receiver |
// object). |
if (is_sloppy(info_->language_mode()) && info()->MayUseThis() && |
- !info_->is_native()) { |
+ !info_->is_native() && info_->scope()->has_this_declaration()) { |
Label ok; |
int receiver_offset = info_->scope()->num_parameters() * kPointerSize; |
__ ldr(r2, MemOperand(sp, receiver_offset)); |
@@ -197,8 +197,9 @@ bool LCodeGen::GeneratePrologue() { |
__ str(r0, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
// Copy any necessary parameters into the context. |
int num_parameters = scope()->num_parameters(); |
- for (int i = 0; i < num_parameters; i++) { |
- Variable* var = scope()->parameter(i); |
+ int first_parameter = 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; |