Index: src/mips64/lithium-codegen-mips64.cc |
diff --git a/src/mips64/lithium-codegen-mips64.cc b/src/mips64/lithium-codegen-mips64.cc |
index 223370f7113b74c49e89e64573456c6ad3bbd239..e8f7234d2333a73d926172ff1aa7d7161efeaf74 100644 |
--- a/src/mips64/lithium-codegen-mips64.cc |
+++ b/src/mips64/lithium-codegen-mips64.cc |
@@ -118,8 +118,8 @@ bool LCodeGen::GeneratePrologue() { |
// Sloppy mode functions and builtins need to replace the receiver with the |
// global proxy when called as functions (without an explicit receiver |
// object). |
- if (is_sloppy(info_->language_mode()) && info()->MayUseThis() && |
- !info_->is_native()) { |
+ if (is_sloppy(info()->language_mode()) && info()->MayUseThis() && |
+ !info()->is_native() && info()->scope()->has_this_declaration()) { |
Label ok; |
int receiver_offset = info_->scope()->num_parameters() * kPointerSize; |
__ LoadRoot(at, Heap::kUndefinedValueRootIndex); |
@@ -192,8 +192,9 @@ bool LCodeGen::GeneratePrologue() { |
__ sd(v0, 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; |