Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index a163319384da8c93753b09d7ccb57f900b773a71..e2273f56c232b6f57f8365d411c9b0db365851ad 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -2476,8 +2476,7 @@ void NonNumberToNumberStub::Generate(MacroAssembler* masm) { |
// eax: object |
// edi: object map |
__ j(above_equal, ¬_string, Label::kNear); |
- StringToNumberStub stub(masm->isolate()); |
- __ TailCallStub(&stub); |
+ __ Jump(isolate()->builtins()->StringToNumber(), RelocInfo::CODE_TARGET); |
__ bind(¬_string); |
Label not_oddball; |
@@ -2493,26 +2492,6 @@ void NonNumberToNumberStub::Generate(MacroAssembler* masm) { |
__ TailCallRuntime(Runtime::kToNumber); |
} |
-void StringToNumberStub::Generate(MacroAssembler* masm) { |
- // The StringToNumber stub takes one argument in eax. |
- __ AssertString(eax); |
- |
- // Check if string has a cached array index. |
- Label runtime; |
- __ test(FieldOperand(eax, String::kHashFieldOffset), |
- Immediate(String::kContainsCachedArrayIndexMask)); |
- __ j(not_zero, &runtime, Label::kNear); |
- __ mov(eax, FieldOperand(eax, String::kHashFieldOffset)); |
- __ IndexFromHash(eax, eax); |
- __ Ret(); |
- |
- __ bind(&runtime); |
- __ PopReturnAddressTo(ecx); // Pop return address. |
- __ Push(eax); // Push argument. |
- __ PushReturnAddressFrom(ecx); // Push return address. |
- __ TailCallRuntime(Runtime::kStringToNumber); |
-} |
- |
void ToStringStub::Generate(MacroAssembler* masm) { |
// The ToString stub takes one argument in eax. |
Label is_number; |