Index: src/compiler/mips/code-generator-mips.cc |
diff --git a/src/compiler/mips/code-generator-mips.cc b/src/compiler/mips/code-generator-mips.cc |
index f7c1e01f80153325ded7c75424b1ab1f737790b9..a49ec4e9f2f18352955d6d8ec12331049610be12 100644 |
--- a/src/compiler/mips/code-generator-mips.cc |
+++ b/src/compiler/mips/code-generator-mips.cc |
@@ -1141,12 +1141,18 @@ void CodeGenerator::AssembleReturn() { |
__ Pop(ra, fp); |
__ Ret(); |
} else if (descriptor->IsJSFunctionCall() || needs_frame_) { |
- __ mov(sp, fp); |
- __ Pop(ra, fp); |
- int pop_count = descriptor->IsJSFunctionCall() |
- ? static_cast<int>(descriptor->JSParameterCount()) |
- : 0; |
- __ DropAndRet(pop_count); |
+ // Canonicalize JSFunction return sites for now. |
+ if (return_label_.is_bound()) { |
+ __ Branch(&return_label_); |
+ } else { |
+ __ bind(&return_label_); |
+ __ mov(sp, fp); |
+ __ Pop(ra, fp); |
+ int pop_count = descriptor->IsJSFunctionCall() |
+ ? static_cast<int>(descriptor->JSParameterCount()) |
+ : 0; |
+ __ DropAndRet(pop_count); |
+ } |
} else { |
__ Ret(); |
} |