S390: [stubs] StringToNumberStub --> StringToNumber builtin.

src/s390/code-stubs-s390.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_S390
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
@@ skipping 2573 matching lines @@
   __ TailCallStub(&stub);
 }
 
 void NonNumberToNumberStub::Generate(MacroAssembler* masm) {
   // The NonNumberToNumber stub takes one argument in r2.
   __ AssertNotNumber(r2);
 
   __ CompareObjectType(r2, r3, r3, FIRST_NONSTRING_TYPE);
   // r2: receiver
   // r3: receiver instance type
-  StringToNumberStub stub(masm->isolate());
-  __ TailCallStub(&stub, lt);
+  __ Jump(isolate()->builtins()->StringToNumber(), RelocInfo::CODE_TARGET, lt);
 
   Label not_oddball;
   __ CmpP(r3, Operand(ODDBALL_TYPE));
   __ bne(&not_oddball, Label::kNear);
   __ LoadP(r2, FieldMemOperand(r2, Oddball::kToNumberOffset));
   __ b(r14);
   __ bind(&not_oddball);
 
   __ push(r2);  // Push argument.
   __ TailCallRuntime(Runtime::kToNumber);
 }
 
-void StringToNumberStub::Generate(MacroAssembler* masm) {
-  // The StringToNumber stub takes one argument in r2.
-  __ AssertString(r2);
-
-  // Check if string has a cached array index.
-  Label runtime;
-  __ LoadlW(r4, FieldMemOperand(r2, String::kHashFieldOffset));
-  __ And(r0, r4, Operand(String::kContainsCachedArrayIndexMask));
-  __ bne(&runtime);
-  __ IndexFromHash(r4, r2);
-  __ Ret();
-
-  __ bind(&runtime);
-  __ push(r2);  // Push argument.
-  __ TailCallRuntime(Runtime::kStringToNumber);
-}
-
 void ToStringStub::Generate(MacroAssembler* masm) {
   // The ToString stub takes one argument in r2.
   Label done;
   Label is_number;
   __ JumpIfSmi(r2, &is_number);
 
   __ CompareObjectType(r2, r3, r3, FIRST_NONSTRING_TYPE);
   // r2: receiver
   // r3: receiver instance type
   __ blt(&done);
@@ skipping 2971 matching lines @@
   CallApiFunctionAndReturn(masm, api_function_address, thunk_ref,
                            kStackUnwindSpace, NULL, return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390