Index: src/ppc/full-codegen-ppc.cc |
diff --git a/src/ppc/full-codegen-ppc.cc b/src/ppc/full-codegen-ppc.cc |
index 27de1dcecb39cabe0595b73a8e6b16c8a872f7e5..db8c3f906904aeec2c56f0d9015c1f80ef276a13 100644 |
--- a/src/ppc/full-codegen-ppc.cc |
+++ b/src/ppc/full-codegen-ppc.cc |
@@ -124,7 +124,7 @@ void FullCodeGenerator::Generate() { |
// global proxy when called as functions (without an explicit receiver |
// object). |
if (is_sloppy(info->language_mode()) && !info->is_native() && |
- info->MayUseThis()) { |
+ info->MayUseThis() && info->scope()->has_this_declaration()) { |
Label ok; |
int receiver_offset = info->scope()->num_parameters() * kPointerSize; |
__ LoadP(r5, MemOperand(sp, receiver_offset), r0); |
@@ -221,8 +221,9 @@ void FullCodeGenerator::Generate() { |
__ StoreP(r3, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
// Copy any necessary parameters into the context. |
int num_parameters = info->scope()->num_parameters(); |
- for (int i = 0; i < num_parameters; i++) { |
- Variable* var = scope()->parameter(i); |
+ int first_parameter = info->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; |
@@ -3049,8 +3050,9 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) { |
__ LoadP(r7, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
// r6: the receiver of the enclosing function. |
- int receiver_offset = 2 + info_->scope()->num_parameters(); |
- __ LoadP(r6, MemOperand(fp, receiver_offset * kPointerSize), r0); |
+ Variable* this_var = scope()->LookupThis(); |
+ DCHECK_NOT_NULL(this_var); |
+ GetVar(r6, this_var); |
// r5: language mode. |
__ LoadSmiLiteral(r5, Smi::FromInt(language_mode())); |