| Index: src/compiler/mips64/code-generator-mips64.cc
|
| diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc
|
| index bd84c442b7fdacab4dfc20ee02bb72a80ab99a08..74adbf4d2eec1bc232a513adf014affc9c429219 100644
|
| --- a/src/compiler/mips64/code-generator-mips64.cc
|
| +++ b/src/compiler/mips64/code-generator-mips64.cc
|
| @@ -1214,12 +1214,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();
|
| }
|
|
|