Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index c238e6120f9afeb1d2c8164af66a4d41b1e2ea7d..30139967f75179dad54e308aef23c37767c1094d 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -1342,7 +1342,6 @@ void LoadIndexedStringStub::Generate(MacroAssembler* masm) { |
&miss, // When not a string. |
&miss, // When not a number. |
&miss, // When index out of range. |
- STRING_INDEX_IS_ARRAY_INDEX, |
RECEIVER_IS_STRING); |
char_at_generator.GenerateFast(masm); |
__ Ret(); |
@@ -2158,13 +2157,7 @@ void StringCharCodeAtGenerator::GenerateSlow( |
// index_ is consumed by runtime conversion function. |
__ Push(object_, index_); |
} |
- if (index_flags_ == STRING_INDEX_IS_NUMBER) { |
- __ CallRuntime(Runtime::kNumberToIntegerMapMinusZero); |
- } else { |
- DCHECK(index_flags_ == STRING_INDEX_IS_ARRAY_INDEX); |
- // NumberToSmi discards numbers that are not exact integers. |
- __ CallRuntime(Runtime::kNumberToSmi); |
- } |
+ __ CallRuntime(Runtime::kNumberToSmi); |
// Save the conversion result before the pop instructions below |
// have a chance to overwrite it. |
__ Move(index_, r0); |
@@ -2494,7 +2487,7 @@ void SubStringStub::Generate(MacroAssembler* masm) { |
// r3: from index (untagged) |
__ SmiTag(r3, r3); |
StringCharAtGenerator generator(r0, r3, r2, r0, &runtime, &runtime, &runtime, |
- STRING_INDEX_IS_NUMBER, RECEIVER_IS_STRING); |
+ RECEIVER_IS_STRING); |
generator.GenerateFast(masm); |
__ Drop(3); |
__ Ret(); |