| Index: src/builtins/arm/builtins-arm.cc
|
| diff --git a/src/builtins/arm/builtins-arm.cc b/src/builtins/arm/builtins-arm.cc
|
| index 286df2eea793f370a964cde4388c808fad7e9a36..d032c2c48e715e48b234c9178de1a45c8efb1f30 100644
|
| --- a/src/builtins/arm/builtins-arm.cc
|
| +++ b/src/builtins/arm/builtins-arm.cc
|
| @@ -1645,6 +1645,69 @@ void Builtins::Generate_NotifyStubFailureSaveDoubles(MacroAssembler* masm) {
|
| Generate_NotifyStubFailureHelper(masm, kSaveFPRegs);
|
| }
|
|
|
| +void Builtins::Generate_NotifyBuiltinContinuation(MacroAssembler* masm) {
|
| + {
|
| + FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
|
| + // Preserve possible return result from lazy deopt.
|
| + __ push(r0);
|
| + // Pass the function and deoptimization type to the runtime system.
|
| + __ CallRuntime(Runtime::kNotifyStubFailure, false);
|
| + __ pop(r0);
|
| + }
|
| +
|
| + __ add(sp, sp, Operand(kPointerSize)); // Ignore state
|
| + __ mov(pc, lr); // Jump to ContinueToBuiltin stub
|
| +}
|
| +
|
| +namespace {
|
| +void Generate_ContinueToBuiltinHelper(MacroAssembler* masm,
|
| + bool java_script_builtin,
|
| + bool with_result) {
|
| + const RegisterConfiguration* config(RegisterConfiguration::Turbofan());
|
| + int allocatable_register_count = config->num_allocatable_general_registers();
|
| + if (with_result) {
|
| + // Overwrite the hole inserted by the deoptimizer with the return value from
|
| + // the LAZY deopt point.
|
| + __ str(r0,
|
| + MemOperand(
|
| + sp, config->num_allocatable_general_registers() * kPointerSize +
|
| + BuiltinContinuationFrameConstants::kFixedFrameSize));
|
| + }
|
| + for (int i = allocatable_register_count - 1; i >= 0; --i) {
|
| + int code = config->GetAllocatableGeneralCode(i);
|
| + __ Pop(Register::from_code(code));
|
| + if (java_script_builtin && code == kJavaScriptCallArgCountRegister.code()) {
|
| + __ SmiUntag(Register::from_code(code));
|
| + }
|
| + }
|
| + __ ldr(fp, MemOperand(
|
| + sp, BuiltinContinuationFrameConstants::kFixedFrameSizeFromFp));
|
| + __ Pop(ip);
|
| + __ add(sp, sp,
|
| + Operand(BuiltinContinuationFrameConstants::kFixedFrameSizeFromFp));
|
| + __ Pop(lr);
|
| + __ add(pc, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| +}
|
| +} // namespace
|
| +
|
| +void Builtins::Generate_ContinueToCodeStubBuiltin(MacroAssembler* masm) {
|
| + Generate_ContinueToBuiltinHelper(masm, false, false);
|
| +}
|
| +
|
| +void Builtins::Generate_ContinueToCodeStubBuiltinWithResult(
|
| + MacroAssembler* masm) {
|
| + Generate_ContinueToBuiltinHelper(masm, false, true);
|
| +}
|
| +
|
| +void Builtins::Generate_ContinueToJavaScriptBuiltin(MacroAssembler* masm) {
|
| + Generate_ContinueToBuiltinHelper(masm, true, false);
|
| +}
|
| +
|
| +void Builtins::Generate_ContinueToJavaScriptBuiltinWithResult(
|
| + MacroAssembler* masm) {
|
| + Generate_ContinueToBuiltinHelper(masm, true, true);
|
| +}
|
| +
|
| static void Generate_NotifyDeoptimizedHelper(MacroAssembler* masm,
|
| Deoptimizer::BailoutType type) {
|
| {
|
|
|