Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 854e5edfb1a98e1b20d7f4166c08d864cc141275..b38f7a46c0af188b8e58aae569d5dd910867bb62 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -142,7 +142,8 @@ bool LCodeGen::GeneratePrologue() { |
// object). |
if (info_->this_has_uses() && |
info_->strict_mode() == SLOPPY && |
- !info_->is_native()) { |
+ !info_->is_native() && |
+ info_->scope()->has_this_declaration()) { |
Label ok; |
// +1 for return address. |
int receiver_offset = (scope()->num_parameters() + 1) * kPointerSize; |
@@ -274,8 +275,9 @@ bool LCodeGen::GeneratePrologue() { |
// Copy parameters into context if necessary. |
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; |