diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc index 02a39966a3..18c4f92f92 100644 --- a/src/mips/lithium-codegen-mips.cc +++ b/src/mips/lithium-codegen-mips.cc @@ -3304,19 +3304,21 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) { // passed unchanged to builtins and strict-mode functions. Label global_object, result_in_receiver; - // Do not transform the receiver to object for strict mode - // functions. - __ lw(scratch, - FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset)); - __ lw(scratch, - FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset)); + if (!instr->hydrogen()->known_function()) { + // Do not transform the receiver to object for strict mode + // functions. + __ lw(scratch, + FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset)); + __ lw(scratch, + FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset)); - // Do not transform the receiver to object for builtins. - int32_t strict_mode_function_mask = - 1 << (SharedFunctionInfo::kStrictModeFunction + kSmiTagSize); - int32_t native_mask = 1 << (SharedFunctionInfo::kNative + kSmiTagSize); - __ And(scratch, scratch, Operand(strict_mode_function_mask | native_mask)); - __ Branch(&result_in_receiver, ne, scratch, Operand(zero_reg)); + // Do not transform the receiver to object for builtins. + int32_t strict_mode_function_mask = + 1 << (SharedFunctionInfo::kStrictModeFunction + kSmiTagSize); + int32_t native_mask = 1 << (SharedFunctionInfo::kNative + kSmiTagSize); + __ And(scratch, scratch, Operand(strict_mode_function_mask | native_mask)); + __ Branch(&result_in_receiver, ne, scratch, Operand(zero_reg)); + } // Normal function. Replace undefined or null with global receiver. __ LoadRoot(scratch, Heap::kNullValueRootIndex); @@ -3331,8 +3333,8 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) { __ GetObjectType(receiver, scratch, scratch); DeoptimizeIf(lt, instr->environment(), scratch, Operand(FIRST_SPEC_OBJECT_TYPE)); - __ Branch(&result_in_receiver); + __ Branch(&result_in_receiver); __ bind(&global_object); __ lw(result, FieldMemOperand(function, JSFunction::kContextOffset)); __ lw(result, diff --git a/src/mips/lithium-mips.h b/src/mips/lithium-mips.h index 19dca48537..6cc13bf4c2 100644 --- a/src/mips/lithium-mips.h +++ b/src/mips/lithium-mips.h @@ -548,6 +548,7 @@ class LWrapReceiver V8_FINAL : public LTemplateInstruction<1, 2, 0> { } DECLARE_CONCRETE_INSTRUCTION(WrapReceiver, "wrap-receiver") + DECLARE_HYDROGEN_ACCESSOR(WrapReceiver) LOperand* receiver() { return inputs_[0]; } LOperand* function() { return inputs_[1]; }