Index: src/full-codegen/mips/full-codegen-mips.cc |
diff --git a/src/full-codegen/mips/full-codegen-mips.cc b/src/full-codegen/mips/full-codegen-mips.cc |
index 2b0aee108153e785b172dca7a2bd76cd48ae0515..3a322ea315c863e48ed991e728f303bd60dc59a5 100644 |
--- a/src/full-codegen/mips/full-codegen-mips.cc |
+++ b/src/full-codegen/mips/full-codegen-mips.cc |
@@ -2117,7 +2117,9 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ sw(a1, MemOperand(sp, 2 * kPointerSize)); |
SetCallPosition(expr, 1); |
__ li(a0, Operand(1)); |
- __ Call(isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
+ __ Call( |
+ isolate()->builtins()->Call(ConvertReceiverMode::kNotNullOrUndefined), |
+ RelocInfo::CODE_TARGET); |
__ lw(cp, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
__ Drop(1); // The function is still on the stack; drop it. |
@@ -2803,6 +2805,7 @@ void FullCodeGenerator::EmitCallWithLoadIC(Call* expr) { |
Expression* callee = expr->expression(); |
// Get the target function. |
+ ConvertReceiverMode convert_mode; |
if (callee->IsVariableProxy()) { |
{ StackValueContext context(this); |
EmitVariableLoad(callee->AsVariableProxy()); |
@@ -2812,6 +2815,7 @@ void FullCodeGenerator::EmitCallWithLoadIC(Call* expr) { |
// is a sloppy mode method. |
__ LoadRoot(at, Heap::kUndefinedValueRootIndex); |
__ push(at); |
+ convert_mode = ConvertReceiverMode::kNullOrUndefined; |
} else { |
// Load the function from the receiver. |
DCHECK(callee->IsProperty()); |
@@ -2823,9 +2827,10 @@ void FullCodeGenerator::EmitCallWithLoadIC(Call* expr) { |
__ lw(at, MemOperand(sp, 0)); |
__ push(at); |
__ sw(v0, MemOperand(sp, kPointerSize)); |
+ convert_mode = ConvertReceiverMode::kNotNullOrUndefined; |
} |
- EmitCall(expr); |
+ EmitCall(expr, convert_mode); |
} |
@@ -2887,7 +2892,7 @@ void FullCodeGenerator::EmitKeyedCallWithLoadIC(Call* expr, |
__ push(at); |
__ sw(v0, MemOperand(sp, kPointerSize)); |
- EmitCall(expr); |
+ EmitCall(expr, ConvertReceiverMode::kNotNullOrUndefined); |
} |
@@ -2927,7 +2932,7 @@ void FullCodeGenerator::EmitKeyedSuperCallWithLoadIC(Call* expr) { |
} |
-void FullCodeGenerator::EmitCall(Call* expr) { |
+void FullCodeGenerator::EmitCall(Call* expr, ConvertReceiverMode mode) { |
// Load the arguments. |
ZoneList<Expression*>* args = expr->arguments(); |
int arg_count = args->length(); |
@@ -2938,7 +2943,7 @@ void FullCodeGenerator::EmitCall(Call* expr) { |
PrepareForBailoutForId(expr->CallId(), NO_REGISTERS); |
// Record source position of the IC call. |
SetCallPosition(expr, arg_count); |
- Handle<Code> ic = CodeFactory::CallIC(isolate(), arg_count).code(); |
+ Handle<Code> ic = CodeFactory::CallIC(isolate(), arg_count, mode).code(); |
__ li(a3, Operand(SmiFromSlot(expr->CallFeedbackICSlot()))); |
__ lw(a1, MemOperand(sp, (arg_count + 1) * kPointerSize)); |
// Don't assign a type feedback id to the IC, since type feedback is provided |
@@ -4244,7 +4249,8 @@ void FullCodeGenerator::EmitCallJSRuntimeFunction(CallRuntime* expr) { |
SetCallPosition(expr, arg_count); |
__ lw(a1, MemOperand(sp, (arg_count + 1) * kPointerSize)); |
__ li(a0, Operand(arg_count)); |
- __ Call(isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
+ __ Call(isolate()->builtins()->Call(ConvertReceiverMode::kNullOrUndefined), |
+ RelocInfo::CODE_TARGET); |
} |