[builtins] NonNumberToNumber and StringToNumber now use CallRuntime instead of TailCallRuntime

src/x64/builtins-x64.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_X64
 
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 2076 matching lines @@
   // Check if string has a cached array index.
   Label runtime;
   __ testl(FieldOperand(rax, String::kHashFieldOffset),
            Immediate(String::kContainsCachedArrayIndexMask));
   __ j(not_zero, &runtime, Label::kNear);
   __ movl(rax, FieldOperand(rax, String::kHashFieldOffset));
   __ IndexFromHash(rax, rax);
   __ Ret();
 
   __ bind(&runtime);
-  __ PopReturnAddressTo(rcx);     // Pop return address.
-  __ Push(rax);                   // Push argument.
-  __ PushReturnAddressFrom(rcx);  // Push return address.
-  __ TailCallRuntime(Runtime::kStringToNumber);
+  {
+    FrameScope frame(masm, StackFrame::INTERNAL);
+    // Push argument.
+    __ Push(rax);
+    // We cannot use a tail call here because this builtin can also be called
+    // from wasm.
+    __ CallRuntime(Runtime::kStringToNumber);
+  }
+  __ Ret();
 }
 
 // static
 void Builtins::Generate_ToNumber(MacroAssembler* masm) {
   // The ToNumber stub takes one argument in rax.
   Label not_smi;
   __ JumpIfNotSmi(rax, &not_smi, Label::kNear);
   __ Ret();
   __ bind(&not_smi);
 
@@ skipping 21 matching lines @@
   __ Jump(masm->isolate()->builtins()->StringToNumber(),
           RelocInfo::CODE_TARGET);
   __ bind(&not_string);
 
   Label not_oddball;
   __ CmpInstanceType(rdi, ODDBALL_TYPE);
   __ j(not_equal, &not_oddball, Label::kNear);
   __ movp(rax, FieldOperand(rax, Oddball::kToNumberOffset));
   __ Ret();
   __ bind(&not_oddball);
-
-  __ PopReturnAddressTo(rcx);     // Pop return address.
-  __ Push(rax);                   // Push argument.
-  __ PushReturnAddressFrom(rcx);  // Push return address.
-  __ TailCallRuntime(Runtime::kToNumber);
+  {
+    FrameScope frame(masm, StackFrame::INTERNAL);
+    // Push argument.
+    __ Push(rax);
+    // We cannot use a tail call here because this builtin can also be called
+    // from wasm.
+    __ CallRuntime(Runtime::kToNumber);
+  }
+  __ Ret();
 }
 
 void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rax : actual number of arguments
   //  -- rbx : expected number of arguments
   //  -- rdx : new target (passed through to callee)
   //  -- rdi : function (passed through to callee)
   // -----------------------------------
 
@@ skipping 874 matching lines @@
   __ ret(0);
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64