Index: src/builtins/mips64/builtins-mips64.cc |
diff --git a/src/builtins/mips64/builtins-mips64.cc b/src/builtins/mips64/builtins-mips64.cc |
index f5ad9f1a7b4ad414b3e94cac48a22f60d18d9f66..4b327c37069eb713e57248c203e05eda950120fb 100644 |
--- a/src/builtins/mips64/builtins-mips64.cc |
+++ b/src/builtins/mips64/builtins-mips64.cc |
@@ -1363,6 +1363,7 @@ |
// ----------------------------------- |
// First lookup code, maybe we don't need to compile! |
Label gotta_call_runtime, gotta_call_runtime_no_stack; |
+ Label maybe_call_runtime; |
Label try_shared; |
Label loop_top, loop_bottom; |
@@ -1426,12 +1427,15 @@ |
FieldMemOperand(array_pointer, |
SharedFunctionInfo::kOffsetToPreviousCachedCode)); |
__ ld(entry, FieldMemOperand(entry, WeakCell::kValueOffset)); |
- __ JumpIfSmi(entry, &try_shared); |
+ __ JumpIfSmi(entry, &maybe_call_runtime); |
// Found literals and code. Get them into the closure and return. |
__ pop(closure); |
// Store code entry in the closure. |
__ Daddu(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag)); |
+ |
+ Label install_optimized_code_and_tailcall; |
+ __ bind(&install_optimized_code_and_tailcall); |
__ sd(entry, FieldMemOperand(closure, JSFunction::kCodeEntryOffset)); |
__ RecordWriteCodeEntryField(closure, entry, a5); |
@@ -1466,8 +1470,20 @@ |
// We found neither literals nor code. |
__ jmp(&gotta_call_runtime); |
+ __ bind(&maybe_call_runtime); |
+ __ pop(closure); |
+ |
+ // Last possibility. Check the context free optimized code map entry. |
+ __ ld(entry, FieldMemOperand(map, FixedArray::kHeaderSize + |
+ SharedFunctionInfo::kSharedCodeIndex)); |
+ __ ld(entry, FieldMemOperand(entry, WeakCell::kValueOffset)); |
+ __ JumpIfSmi(entry, &try_shared); |
+ |
+ // Store code entry in the closure. |
+ __ Daddu(entry, entry, Operand(Code::kHeaderSize - kHeapObjectTag)); |
+ __ jmp(&install_optimized_code_and_tailcall); |
+ |
__ bind(&try_shared); |
- __ pop(closure); |
__ pop(new_target); |
__ pop(argument_count); |
// Is the full code valid? |