PPC/s390: [builtins] NonNumberToNumber and StringToNumber now use CallRuntime instead of TailCallRu…

src/ppc/builtins-ppc.cc

 // Copyright 2014 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_PPC
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 2754 matching lines @@
 
   // Check if string has a cached array index.
   Label runtime;
   __ lwz(r5, FieldMemOperand(r3, String::kHashFieldOffset));
   __ And(r0, r5, Operand(String::kContainsCachedArrayIndexMask), SetRC);
   __ bne(&runtime, cr0);
   __ IndexFromHash(r5, r3);
   __ blr();
 
   __ bind(&runtime);
-  __ push(r3);  // Push argument.
-  __ TailCallRuntime(Runtime::kStringToNumber);
+  {
+    FrameScope frame(masm, StackFrame::INTERNAL);
+    // Push argument.
+    __ push(r3);
+    // 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 r3.
   STATIC_ASSERT(kSmiTag == 0);
   __ TestIfSmi(r3, r0);
   __ Ret(eq, cr0);
 
   __ CompareObjectType(r3, r4, r4, HEAP_NUMBER_TYPE);
@@ skipping 16 matching lines @@
   __ Jump(masm->isolate()->builtins()->StringToNumber(), RelocInfo::CODE_TARGET,
           lt);
 
   Label not_oddball;
   __ cmpi(r4, Operand(ODDBALL_TYPE));
   __ bne(&not_oddball);
   __ LoadP(r3, FieldMemOperand(r3, Oddball::kToNumberOffset));
   __ blr();
   __ bind(&not_oddball);
 
-  __ push(r3);  // Push argument.
-  __ TailCallRuntime(Runtime::kToNumber);
+  {
+    FrameScope frame(masm, StackFrame::INTERNAL);
+    // Push argument.
+    __ push(r3);
+    // 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 -------------
   //  -- r3 : actual number of arguments
   //  -- r4 : function (passed through to callee)
   //  -- r5 : expected number of arguments
   //  -- r6 : new target (passed through to callee)
   // -----------------------------------
 
@@ skipping 121 matching lines @@
     __ bkpt(0);
   }
 }
 
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_PPC