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

src/arm/builtins-arm.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_ARM
 
 #include "src/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 2681 matching lines @@
 
   // Check if string has a cached array index.
   Label runtime;
   __ ldr(r2, FieldMemOperand(r0, String::kHashFieldOffset));
   __ tst(r2, Operand(String::kContainsCachedArrayIndexMask));
   __ b(ne, &runtime);
   __ IndexFromHash(r2, r0);
   __ Ret();
 
   __ bind(&runtime);
-  __ Push(r0);  // Push argument.
-  __ TailCallRuntime(Runtime::kStringToNumber);
+  {
+    FrameScope frame(masm, StackFrame::INTERNAL);
+    // Push argument.
+    __ Push(r0);
+    // We cannot use a tail call here because this builtin can also be called
+    // from wasm.
+    __ CallRuntime(Runtime::kToNumber);

[Benedikt Meurer, 2016/06/21 08:32:48]

kStringToNumber here and on all other ports.

[ahaas, 2016/06/21 08:52:58]

done.

+  }
+  __ Ret();
 }
 
 void Builtins::Generate_ToNumber(MacroAssembler* masm) {
   // The ToNumber stub takes one argument in r0.
   STATIC_ASSERT(kSmiTag == 0);
   __ tst(r0, Operand(kSmiTagMask));
   __ Ret(eq);
 
   __ CompareObjectType(r0, r1, r1, HEAP_NUMBER_TYPE);
   // r0: receiver
@@ skipping 13 matching lines @@
   // r1: receiver instance type
   __ Jump(masm->isolate()->builtins()->StringToNumber(), RelocInfo::CODE_TARGET,
           lo);
 
   Label not_oddball;
   __ cmp(r1, Operand(ODDBALL_TYPE));
   __ b(ne, &not_oddball);
   __ ldr(r0, FieldMemOperand(r0, Oddball::kToNumberOffset));
   __ Ret();
   __ bind(&not_oddball);
-
-  __ Push(r0);  // Push argument.
-  __ TailCallRuntime(Runtime::kToNumber);
+  {
+    FrameScope frame(masm, StackFrame::INTERNAL);
+    // Push argument.
+    __ Push(r0);
+    // 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 -------------
   //  -- r0 : actual number of arguments
   //  -- r1 : function (passed through to callee)
   //  -- r2 : expected number of arguments
   //  -- r3 : new target (passed through to callee)
   // -----------------------------------
 
@@ skipping 113 matching lines @@
   }
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_ARM