[codegen] Delete unused StringCharLoadGenerator

Bug: v8:6921
Change-Id: I9e42d0a5e7ce7fdda1d00468a82d35b973200e2c
Reviewed-on: https://chromium-review.googlesource.com/718697Reviewed-by: Camillo Bruni <cbruni@chromium.org>
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48545}

BUILD.gn

@@ -2133,7 +2133,6 @@ v8_source_set("v8_base") {
       "src/ia32/code-stubs-ia32.cc",
       "src/ia32/code-stubs-ia32.h",
       "src/ia32/codegen-ia32.cc",
-      "src/ia32/codegen-ia32.h",
       "src/ia32/cpu-ia32.cc",
       "src/ia32/deoptimizer-ia32.cc",
       "src/ia32/disasm-ia32.cc",
@@ -2195,7 +2194,6 @@ v8_source_set("v8_base") {
       "src/arm/code-stubs-arm.cc",
       "src/arm/code-stubs-arm.h",
       "src/arm/codegen-arm.cc",
-      "src/arm/codegen-arm.h",
       "src/arm/constants-arm.cc",
       "src/arm/constants-arm.h",
       "src/arm/cpu-arm.cc",
@@ -2230,7 +2228,6 @@ v8_source_set("v8_base") {
       "src/arm64/code-stubs-arm64.cc",
       "src/arm64/code-stubs-arm64.h",
       "src/arm64/codegen-arm64.cc",
-      "src/arm64/codegen-arm64.h",
       "src/arm64/constants-arm64.h",
       "src/arm64/cpu-arm64.cc",
       "src/arm64/decoder-arm64-inl.h",
@@ -2291,7 +2288,6 @@ v8_source_set("v8_base") {
       "src/mips/code-stubs-mips.cc",
       "src/mips/code-stubs-mips.h",
       "src/mips/codegen-mips.cc",
-      "src/mips/codegen-mips.h",
       "src/mips/constants-mips.cc",
       "src/mips/constants-mips.h",
       "src/mips/cpu-mips.cc",
@@ -2322,7 +2318,6 @@ v8_source_set("v8_base") {
       "src/mips64/code-stubs-mips64.cc",
       "src/mips64/code-stubs-mips64.h",
       "src/mips64/codegen-mips64.cc",
-      "src/mips64/codegen-mips64.h",
       "src/mips64/constants-mips64.cc",
       "src/mips64/constants-mips64.h",
       "src/mips64/cpu-mips64.cc",
@@ -2353,7 +2348,6 @@ v8_source_set("v8_base") {
       "src/ppc/code-stubs-ppc.cc",
       "src/ppc/code-stubs-ppc.h",
       "src/ppc/codegen-ppc.cc",
-      "src/ppc/codegen-ppc.h",
       "src/ppc/constants-ppc.cc",
       "src/ppc/constants-ppc.h",
       "src/ppc/cpu-ppc.cc",
@@ -2386,7 +2380,6 @@ v8_source_set("v8_base") {
       "src/s390/code-stubs-s390.cc",
       "src/s390/code-stubs-s390.h",
       "src/s390/codegen-s390.cc",
-      "src/s390/codegen-s390.h",
       "src/s390/constants-s390.cc",
       "src/s390/constants-s390.h",
       "src/s390/cpu-s390.cc",

src/arm/codegen-arm.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/arm/codegen-arm.h"
-
 #if V8_TARGET_ARCH_ARM
 
 #include <memory>
@@ -298,106 +296,6 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
 
 #undef __
 
-// -------------------------------------------------------------------------
-// Code generators
-
-#define __ ACCESS_MASM(masm)
-
-void StringCharLoadGenerator::Generate(MacroAssembler* masm,
-                                       Register string,
-                                       Register index,
-                                       Register result,
-                                       Label* call_runtime) {
-  Label indirect_string_loaded;
-  __ bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ ldr(result, FieldMemOperand(string, HeapObject::kMapOffset));
-  __ ldrb(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ tst(result, Operand(kIsIndirectStringMask));
-  __ b(eq, &check_sequential);
-
-  // Dispatch on the indirect string shape: slice or cons.
-  Label cons_string, thin_string;
-  __ and_(result, result, Operand(kStringRepresentationMask));
-  __ cmp(result, Operand(kConsStringTag));
-  __ b(eq, &cons_string);
-  __ cmp(result, Operand(kThinStringTag));
-  __ b(eq, &thin_string);
-
-  // Handle slices.
-  __ ldr(result, FieldMemOperand(string, SlicedString::kOffsetOffset));
-  __ ldr(string, FieldMemOperand(string, SlicedString::kParentOffset));
-  __ add(index, index, Operand::SmiUntag(result));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ bind(&thin_string);
-  __ ldr(string, FieldMemOperand(string, ThinString::kActualOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ bind(&cons_string);
-  __ ldr(result, FieldMemOperand(string, ConsString::kSecondOffset));
-  __ CompareRoot(result, Heap::kempty_stringRootIndex);
-  __ b(ne, call_runtime);
-  // Get the first of the two strings and load its instance type.
-  __ ldr(string, FieldMemOperand(string, ConsString::kFirstOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label external_string, check_encoding;
-  __ bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ tst(result, Operand(kStringRepresentationMask));
-  __ b(ne, &external_string);
-
-  // Prepare sequential strings
-  STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
-  __ add(string,
-         string,
-         Operand(SeqTwoByteString::kHeaderSize - kHeapObjectTag));
-  __ jmp(&check_encoding);
-
-  // Handle external strings.
-  __ bind(&external_string);
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ tst(result, Operand(kIsIndirectStringMask));
-    __ Assert(eq, kExternalStringExpectedButNotFound);
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  __ tst(result, Operand(kShortExternalStringMask));
-  __ b(ne, call_runtime);
-  __ ldr(string, FieldMemOperand(string, ExternalString::kResourceDataOffset));
-
-  Label one_byte, done;
-  __ bind(&check_encoding);
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ tst(result, Operand(kStringEncodingMask));
-  __ b(ne, &one_byte);
-  // Two-byte string.
-  __ ldrh(result, MemOperand(string, index, LSL, 1));
-  __ jmp(&done);
-  __ bind(&one_byte);
-  // One-byte string.
-  __ ldrb(result, MemOperand(string, index));
-  __ bind(&done);
-}
-
-#undef __
-
 }  // namespace internal
 }  // namespace v8
 

src/arm/codegen-arm.h

-// Copyright 2011 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.
-
-#ifndef V8_ARM_CODEGEN_ARM_H_
-#define V8_ARM_CODEGEN_ARM_H_
-
-#include "src/macro-assembler.h"
-
-namespace v8 {
-namespace internal {
-
-
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output.
-  static void Generate(MacroAssembler* masm,
-                       Register string,
-                       Register index,
-                       Register result,
-                       Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-
-
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_ARM_CODEGEN_ARM_H_

src/arm64/codegen-arm64.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/arm64/codegen-arm64.h"
-
 #if V8_TARGET_ARCH_ARM64
 
 #include "src/arm64/assembler-arm64-inl.h"
@@ -21,100 +19,6 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
   return nullptr;
 }
 
-// -------------------------------------------------------------------------
-// Code generators
-
-void StringCharLoadGenerator::Generate(MacroAssembler* masm,
-                                       Register string,
-                                       Register index,
-                                       Register result,
-                                       Label* call_runtime) {
-  DCHECK(string.Is64Bits() && index.Is32Bits() && result.Is64Bits());
-  Label indirect_string_loaded;
-  __ Bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ Ldr(result, FieldMemOperand(string, HeapObject::kMapOffset));
-  __ Ldrb(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ TestAndBranchIfAllClear(result, kIsIndirectStringMask, &check_sequential);
-
-  // Dispatch on the indirect string shape: slice or cons.
-  Label cons_string, thin_string;
-  __ And(result, result, kStringRepresentationMask);
-  __ Cmp(result, kConsStringTag);
-  __ B(eq, &cons_string);
-  __ Cmp(result, kThinStringTag);
-  __ B(eq, &thin_string);
-
-  // Handle slices.
-  __ Ldr(result.W(),
-         UntagSmiFieldMemOperand(string, SlicedString::kOffsetOffset));
-  __ Ldr(string, FieldMemOperand(string, SlicedString::kParentOffset));
-  __ Add(index, index, result.W());
-  __ B(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ Bind(&thin_string);
-  __ Ldr(string, FieldMemOperand(string, ThinString::kActualOffset));
-  __ B(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ Bind(&cons_string);
-  __ Ldr(result, FieldMemOperand(string, ConsString::kSecondOffset));
-  __ JumpIfNotRoot(result, Heap::kempty_stringRootIndex, call_runtime);
-  // Get the first of the two strings and load its instance type.
-  __ Ldr(string, FieldMemOperand(string, ConsString::kFirstOffset));
-  __ B(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label external_string, check_encoding;
-  __ Bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ TestAndBranchIfAnySet(result, kStringRepresentationMask, &external_string);
-
-  // Prepare sequential strings
-  STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
-  __ Add(string, string, SeqTwoByteString::kHeaderSize - kHeapObjectTag);
-  __ B(&check_encoding);
-
-  // Handle external strings.
-  __ Bind(&external_string);
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ Tst(result, kIsIndirectStringMask);
-    __ Assert(eq, kExternalStringExpectedButNotFound);
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  // TestAndBranchIfAnySet can emit Tbnz. Do not use it because call_runtime
-  // can be bound far away in deferred code.
-  __ Tst(result, kShortExternalStringMask);
-  __ B(ne, call_runtime);
-  __ Ldr(string, FieldMemOperand(string, ExternalString::kResourceDataOffset));
-
-  Label one_byte, done;
-  __ Bind(&check_encoding);
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ TestAndBranchIfAnySet(result, kStringEncodingMask, &one_byte);
-  // Two-byte string.
-  __ Ldrh(result, MemOperand(string, index, SXTW, 1));
-  __ B(&done);
-  __ Bind(&one_byte);
-  // One-byte string.
-  __ Ldrb(result, MemOperand(string, index, SXTW));
-  __ Bind(&done);
-}
-
 #undef __
 
 }  // namespace internal

src/arm64/codegen-arm64.h

-// Copyright 2013 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.
-
-#ifndef V8_ARM64_CODEGEN_ARM64_H_
-#define V8_ARM64_CODEGEN_ARM64_H_
-
-#include "src/macro-assembler.h"
-
-namespace v8 {
-namespace internal {
-
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output. Register index is asserted to be a 32-bit W
-  // register.
-  static void Generate(MacroAssembler* masm,
-                       Register string,
-                       Register index,
-                       Register result,
-                       Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_ARM64_CODEGEN_ARM64_H_

src/bailout-reason.h

@@ -40,8 +40,6 @@ namespace internal {
     "Expected optimized code cell or optimization sentinel")                   \
   V(kExpectedNewSpaceObject, "Expected new space object")                      \
   V(kExpectedUndefinedOrCell, "Expected undefined or cell in register")        \
-  V(kExternalStringExpectedButNotFound,                                        \
-    "External string expected, but not found")                                 \
   V(kForOfStatement, "ForOfStatement")                                         \
   V(kFunctionBeingDebugged, "Function is being debugged")                      \
   V(kFunctionCallsEval, "Function calls eval")                                 \

src/codegen.h

@@ -7,6 +7,7 @@
 
 #include "src/code-stubs.h"
 #include "src/globals.h"
+#include "src/macro-assembler.h"
 #include "src/runtime/runtime.h"
 
 // Include the declaration of the architecture defined class CodeGenerator.
@@ -42,24 +43,8 @@
 //   CodeForDoWhileConditionPosition
 //   CodeForSourcePosition
 
-#if V8_TARGET_ARCH_IA32
-#include "src/ia32/codegen-ia32.h"  // NOLINT
-#elif V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
 #include "src/x64/codegen-x64.h"  // NOLINT
-#elif V8_TARGET_ARCH_ARM64
-#include "src/arm64/codegen-arm64.h"  // NOLINT
-#elif V8_TARGET_ARCH_ARM
-#include "src/arm/codegen-arm.h"  // NOLINT
-#elif V8_TARGET_ARCH_PPC
-#include "src/ppc/codegen-ppc.h"  // NOLINT
-#elif V8_TARGET_ARCH_MIPS
-#include "src/mips/codegen-mips.h"  // NOLINT
-#elif V8_TARGET_ARCH_MIPS64
-#include "src/mips64/codegen-mips64.h"  // NOLINT
-#elif V8_TARGET_ARCH_S390
-#include "src/s390/codegen-s390.h"  // NOLINT
-#else
-#error Unsupported target architecture.
 #endif
 
 namespace v8 {

src/ia32/codegen-ia32.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/ia32/codegen-ia32.h"
-
 #if V8_TARGET_ARCH_IA32
 
 #include "src/codegen.h"
@@ -461,123 +459,6 @@ MemMoveFunction CreateMemMoveFunction(Isolate* isolate) {
 }
 
 
-#undef __
-
-// -------------------------------------------------------------------------
-// Code generators
-
-#define __ ACCESS_MASM(masm)
-
-void StringCharLoadGenerator::Generate(MacroAssembler* masm,
-                                       Factory* factory,
-                                       Register string,
-                                       Register index,
-                                       Register result,
-                                       Label* call_runtime) {
-  Label indirect_string_loaded;
-  __ bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ mov(result, FieldOperand(string, HeapObject::kMapOffset));
-  __ movzx_b(result, FieldOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ test(result, Immediate(kIsIndirectStringMask));
-  __ j(zero, &check_sequential, Label::kNear);
-
-  // Dispatch on the indirect string shape: slice or cons.
-  Label cons_string, thin_string;
-  __ and_(result, Immediate(kStringRepresentationMask));
-  __ cmp(result, Immediate(kConsStringTag));
-  __ j(equal, &cons_string, Label::kNear);
-  __ cmp(result, Immediate(kThinStringTag));
-  __ j(equal, &thin_string, Label::kNear);
-
-  // Handle slices.
-  __ mov(result, FieldOperand(string, SlicedString::kOffsetOffset));
-  __ SmiUntag(result);
-  __ add(index, result);
-  __ mov(string, FieldOperand(string, SlicedString::kParentOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ bind(&thin_string);
-  __ mov(string, FieldOperand(string, ThinString::kActualOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ bind(&cons_string);
-  __ cmp(FieldOperand(string, ConsString::kSecondOffset),
-         Immediate(factory->empty_string()));
-  __ j(not_equal, call_runtime);
-  __ mov(string, FieldOperand(string, ConsString::kFirstOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label seq_string;
-  __ bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ test(result, Immediate(kStringRepresentationMask));
-  __ j(zero, &seq_string, Label::kNear);
-
-  // Handle external strings.
-  Label one_byte_external, done;
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ test(result, Immediate(kIsIndirectStringMask));
-    __ Assert(zero, kExternalStringExpectedButNotFound);
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  __ test_b(result, Immediate(kShortExternalStringMask));
-  __ j(not_zero, call_runtime);
-  // Check encoding.
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ test_b(result, Immediate(kStringEncodingMask));
-  __ mov(result, FieldOperand(string, ExternalString::kResourceDataOffset));
-  __ j(not_equal, &one_byte_external, Label::kNear);
-  // Two-byte string.
-  __ movzx_w(result, Operand(result, index, times_2, 0));
-  __ jmp(&done, Label::kNear);
-  __ bind(&one_byte_external);
-  // One-byte string.
-  __ movzx_b(result, Operand(result, index, times_1, 0));
-  __ jmp(&done, Label::kNear);
-
-  // Dispatch on the encoding: one-byte or two-byte.
-  Label one_byte;
-  __ bind(&seq_string);
-  STATIC_ASSERT((kStringEncodingMask & kOneByteStringTag) != 0);
-  STATIC_ASSERT((kStringEncodingMask & kTwoByteStringTag) == 0);
-  __ test(result, Immediate(kStringEncodingMask));
-  __ j(not_zero, &one_byte, Label::kNear);
-
-  // Two-byte string.
-  // Load the two-byte character code into the result register.
-  __ movzx_w(result, FieldOperand(string,
-                                  index,
-                                  times_2,
-                                  SeqTwoByteString::kHeaderSize));
-  __ jmp(&done, Label::kNear);
-
-  // One-byte string.
-  // Load the byte into the result register.
-  __ bind(&one_byte);
-  __ movzx_b(result, FieldOperand(string,
-                                  index,
-                                  times_1,
-                                  SeqOneByteString::kHeaderSize));
-  __ bind(&done);
-}
-
 #undef __
 
 }  // namespace internal

src/ia32/codegen-ia32.h

-// Copyright 2011 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.
-
-#ifndef V8_IA32_CODEGEN_IA32_H_
-#define V8_IA32_CODEGEN_IA32_H_
-
-#include "src/macro-assembler.h"
-
-namespace v8 {
-namespace internal {
-
-
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output.
-  static void Generate(MacroAssembler* masm,
-                       Factory* factory,
-                       Register string,
-                       Register index,
-                       Register result,
-                       Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-
-
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_IA32_CODEGEN_IA32_H_

src/mips/codegen-mips.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/mips/codegen-mips.h"
-
 #if V8_TARGET_ARCH_MIPS
 
 #include <memory>
@@ -582,108 +580,6 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
 
 #undef __
 
-// -------------------------------------------------------------------------
-// Code generators
-
-#define __ ACCESS_MASM(masm)
-
-void StringCharLoadGenerator::Generate(MacroAssembler* masm,
-                                       Register string,
-                                       Register index,
-                                       Register result,
-                                       Label* call_runtime) {
-  Label indirect_string_loaded;
-  __ bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ lw(result, FieldMemOperand(string, HeapObject::kMapOffset));
-  __ lbu(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ And(at, result, Operand(kIsIndirectStringMask));
-  __ Branch(&check_sequential, eq, at, Operand(zero_reg));
-
-  // Dispatch on the indirect string shape: slice or cons.
-  Label cons_string, thin_string;
-  __ And(at, result, Operand(kStringRepresentationMask));
-  __ Branch(&cons_string, eq, at, Operand(kConsStringTag));
-  __ Branch(&thin_string, eq, at, Operand(kThinStringTag));
-
-  // Handle slices.
-  __ lw(result, FieldMemOperand(string, SlicedString::kOffsetOffset));
-  __ lw(string, FieldMemOperand(string, SlicedString::kParentOffset));
-  __ sra(at, result, kSmiTagSize);
-  __ Addu(index, index, at);
-  __ jmp(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ bind(&thin_string);
-  __ lw(string, FieldMemOperand(string, ThinString::kActualOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ bind(&cons_string);
-  __ lw(result, FieldMemOperand(string, ConsString::kSecondOffset));
-  __ LoadRoot(at, Heap::kempty_stringRootIndex);
-  __ Branch(call_runtime, ne, result, Operand(at));
-  // Get the first of the two strings and load its instance type.
-  __ lw(string, FieldMemOperand(string, ConsString::kFirstOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label external_string, check_encoding;
-  __ bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ And(at, result, Operand(kStringRepresentationMask));
-  __ Branch(&external_string, ne, at, Operand(zero_reg));
-
-  // Prepare sequential strings
-  STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
-  __ Addu(string,
-          string,
-          SeqTwoByteString::kHeaderSize - kHeapObjectTag);
-  __ jmp(&check_encoding);
-
-  // Handle external strings.
-  __ bind(&external_string);
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ And(at, result, Operand(kIsIndirectStringMask));
-    __ Assert(eq, kExternalStringExpectedButNotFound,
-        at, Operand(zero_reg));
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  __ And(at, result, Operand(kShortExternalStringMask));
-  __ Branch(call_runtime, ne, at, Operand(zero_reg));
-  __ lw(string, FieldMemOperand(string, ExternalString::kResourceDataOffset));
-
-  Label one_byte, done;
-  __ bind(&check_encoding);
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ And(at, result, Operand(kStringEncodingMask));
-  __ Branch(&one_byte, ne, at, Operand(zero_reg));
-  // Two-byte string.
-  __ Lsa(at, string, index, 1);
-  __ lhu(result, MemOperand(at));
-  __ jmp(&done);
-  __ bind(&one_byte);
-  // One_byte string.
-  __ Addu(at, string, index);
-  __ lbu(result, MemOperand(at));
-  __ bind(&done);
-}
-
-#undef __
-
 }  // namespace internal
 }  // namespace v8
 

src/mips/codegen-mips.h

-// Copyright 2011 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.
-
-
-#ifndef V8_MIPS_CODEGEN_MIPS_H_
-#define V8_MIPS_CODEGEN_MIPS_H_
-
-#include "src/macro-assembler.h"
-
-namespace v8 {
-namespace internal {
-
-
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output.
-  static void Generate(MacroAssembler* masm,
-                       Register string,
-                       Register index,
-                       Register result,
-                       Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_MIPS_CODEGEN_MIPS_H_

src/mips64/codegen-mips64.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/mips64/codegen-mips64.h"
-
 #if V8_TARGET_ARCH_MIPS64
 
 #include <memory>
@@ -584,108 +582,6 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
 
 #undef __
 
-// -------------------------------------------------------------------------
-// Code generators
-
-#define __ ACCESS_MASM(masm)
-
-void StringCharLoadGenerator::Generate(MacroAssembler* masm,
-                                       Register string,
-                                       Register index,
-                                       Register result,
-                                       Label* call_runtime) {
-  Label indirect_string_loaded;
-  __ bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ Ld(result, FieldMemOperand(string, HeapObject::kMapOffset));
-  __ Lbu(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ And(at, result, Operand(kIsIndirectStringMask));
-  __ Branch(&check_sequential, eq, at, Operand(zero_reg));
-
-  // Dispatch on the indirect string shape: slice or cons.
-  Label cons_string, thin_string;
-  __ And(at, result, Operand(kStringRepresentationMask));
-  __ Branch(&cons_string, eq, at, Operand(kConsStringTag));
-  __ Branch(&thin_string, eq, at, Operand(kThinStringTag));
-
-  // Handle slices.
-  __ Ld(result, FieldMemOperand(string, SlicedString::kOffsetOffset));
-  __ Ld(string, FieldMemOperand(string, SlicedString::kParentOffset));
-  __ dsra32(at, result, 0);
-  __ Daddu(index, index, at);
-  __ jmp(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ bind(&thin_string);
-  __ Ld(string, FieldMemOperand(string, ThinString::kActualOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ bind(&cons_string);
-  __ Ld(result, FieldMemOperand(string, ConsString::kSecondOffset));
-  __ LoadRoot(at, Heap::kempty_stringRootIndex);
-  __ Branch(call_runtime, ne, result, Operand(at));
-  // Get the first of the two strings and load its instance type.
-  __ Ld(string, FieldMemOperand(string, ConsString::kFirstOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label external_string, check_encoding;
-  __ bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ And(at, result, Operand(kStringRepresentationMask));
-  __ Branch(&external_string, ne, at, Operand(zero_reg));
-
-  // Prepare sequential strings
-  STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
-  __ Daddu(string,
-          string,
-          SeqTwoByteString::kHeaderSize - kHeapObjectTag);
-  __ jmp(&check_encoding);
-
-  // Handle external strings.
-  __ bind(&external_string);
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ And(at, result, Operand(kIsIndirectStringMask));
-    __ Assert(eq, kExternalStringExpectedButNotFound,
-        at, Operand(zero_reg));
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  __ And(at, result, Operand(kShortExternalStringMask));
-  __ Branch(call_runtime, ne, at, Operand(zero_reg));
-  __ Ld(string, FieldMemOperand(string, ExternalString::kResourceDataOffset));
-
-  Label one_byte, done;
-  __ bind(&check_encoding);
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ And(at, result, Operand(kStringEncodingMask));
-  __ Branch(&one_byte, ne, at, Operand(zero_reg));
-  // Two-byte string.
-  __ Dlsa(at, string, index, 1);
-  __ Lhu(result, MemOperand(at));
-  __ jmp(&done);
-  __ bind(&one_byte);
-  // One_byte string.
-  __ Daddu(at, string, index);
-  __ Lbu(result, MemOperand(at));
-  __ bind(&done);
-}
-
-#undef __
-
 }  // namespace internal
 }  // namespace v8
 

src/mips64/codegen-mips64.h

-// Copyright 2011 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.
-
-
-#ifndef V8_MIPS_CODEGEN_MIPS_H_
-#define V8_MIPS_CODEGEN_MIPS_H_
-
-#include "src/macro-assembler.h"
-
-namespace v8 {
-namespace internal {
-
-
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output.
-  static void Generate(MacroAssembler* masm,
-                       Register string,
-                       Register index,
-                       Register result,
-                       Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_MIPS_CODEGEN_MIPS_H_

src/ppc/codegen-ppc.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/ppc/codegen-ppc.h"
-
 #if V8_TARGET_ARCH_PPC
 
 #include <memory>
@@ -51,107 +49,6 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
 
 #undef __
 
-// -------------------------------------------------------------------------
-// Code generators
-
-#define __ ACCESS_MASM(masm)
-
-// assume ip can be used as a scratch register below
-void StringCharLoadGenerator::Generate(MacroAssembler* masm, Register string,
-                                       Register index, Register result,
-                                       Label* call_runtime) {
-  Label indirect_string_loaded;
-  __ bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ LoadP(result, FieldMemOperand(string, HeapObject::kMapOffset));
-  __ lbz(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ andi(r0, result, Operand(kIsIndirectStringMask));
-  __ beq(&check_sequential, cr0);
-
-  // Dispatch on the indirect string shape: slice or cons or thin.
-  Label cons_string, thin_string;
-  __ andi(ip, result, Operand(kStringRepresentationMask));
-  __ cmpi(ip, Operand(kConsStringTag));
-  __ beq(&cons_string);
-  __ cmpi(ip, Operand(kThinStringTag));
-  __ beq(&thin_string);
-
-  // Handle slices.
-  __ LoadP(result, FieldMemOperand(string, SlicedString::kOffsetOffset));
-  __ LoadP(string, FieldMemOperand(string, SlicedString::kParentOffset));
-  __ SmiUntag(ip, result);
-  __ add(index, index, ip);
-  __ b(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ bind(&thin_string);
-  __ LoadP(string, FieldMemOperand(string, ThinString::kActualOffset));
-  __ b(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ bind(&cons_string);
-  __ LoadP(result, FieldMemOperand(string, ConsString::kSecondOffset));
-  __ CompareRoot(result, Heap::kempty_stringRootIndex);
-  __ bne(call_runtime);
-  // Get the first of the two strings and load its instance type.
-  __ LoadP(string, FieldMemOperand(string, ConsString::kFirstOffset));
-  __ b(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label external_string, check_encoding;
-  __ bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ andi(r0, result, Operand(kStringRepresentationMask));
-  __ bne(&external_string, cr0);
-
-  // Prepare sequential strings
-  STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
-  __ addi(string, string,
-          Operand(SeqTwoByteString::kHeaderSize - kHeapObjectTag));
-  __ b(&check_encoding);
-
-  // Handle external strings.
-  __ bind(&external_string);
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ andi(r0, result, Operand(kIsIndirectStringMask));
-    __ Assert(eq, kExternalStringExpectedButNotFound, cr0);
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  __ andi(r0, result, Operand(kShortExternalStringMask));
-  __ bne(call_runtime, cr0);
-  __ LoadP(string,
-           FieldMemOperand(string, ExternalString::kResourceDataOffset));
-
-  Label one_byte, done;
-  __ bind(&check_encoding);
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ andi(r0, result, Operand(kStringEncodingMask));
-  __ bne(&one_byte, cr0);
-  // Two-byte string.
-  __ ShiftLeftImm(result, index, Operand(1));
-  __ lhzx(result, MemOperand(string, result));
-  __ b(&done);
-  __ bind(&one_byte);
-  // One-byte string.
-  __ lbzx(result, MemOperand(string, index));
-  __ bind(&done);
-}
-
-#undef __
-
 }  // namespace internal
 }  // namespace v8
 

src/ppc/codegen-ppc.h

-// 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.
-
-#ifndef V8_PPC_CODEGEN_PPC_H_
-#define V8_PPC_CODEGEN_PPC_H_
-
-#include "src/macro-assembler.h"
-
-namespace v8 {
-namespace internal {
-
-
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output.
-  static void Generate(MacroAssembler* masm, Register string, Register index,
-                       Register result, Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_PPC_CODEGEN_PPC_H_

src/s390/codegen-s390.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/s390/codegen-s390.h"
-
 #if V8_TARGET_ARCH_S390
 
 #include <memory>
@@ -47,112 +45,6 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
 
 #undef __
 
-// -------------------------------------------------------------------------
-// Code generators
-
-#define __ ACCESS_MASM(masm)
-
-// assume ip can be used as a scratch register below
-void StringCharLoadGenerator::Generate(MacroAssembler* masm, Register string,
-                                       Register index, Register result,
-                                       Label* call_runtime) {
-  Label indirect_string_loaded;
-  __ bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ LoadP(result, FieldMemOperand(string, HeapObject::kMapOffset));
-  __ LoadlB(result, FieldMemOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ mov(r0, Operand(kIsIndirectStringMask));
-  __ AndP(r0, result);
-  __ beq(&check_sequential, Label::kNear /*, cr0*/);
-
-  // Dispatch on the indirect string shape: slice or cons.
-  Label cons_string, thin_string;
-  __ LoadRR(ip, result);
-  __ nilf(ip, Operand(kStringRepresentationMask));
-  __ CmpP(ip, Operand(kConsStringTag));
-  __ beq(&cons_string);
-  __ CmpP(ip, Operand(kThinStringTag));
-  __ beq(&thin_string);
-
-  // Handle slices.
-  __ LoadP(result, FieldMemOperand(string, SlicedString::kOffsetOffset));
-  __ LoadP(string, FieldMemOperand(string, SlicedString::kParentOffset));
-  __ SmiUntag(ip, result);
-  __ AddP(index, ip);
-  __ b(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ bind(&thin_string);
-  __ LoadP(string, FieldMemOperand(string, ThinString::kActualOffset));
-  __ b(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ bind(&cons_string);
-  __ LoadP(result, FieldMemOperand(string, ConsString::kSecondOffset));
-  __ CompareRoot(result, Heap::kempty_stringRootIndex);
-  __ bne(call_runtime);
-  // Get the first of the two strings and load its instance type.
-  __ LoadP(string, FieldMemOperand(string, ConsString::kFirstOffset));
-  __ b(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label external_string, check_encoding;
-  __ bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ mov(r0, Operand(kStringRepresentationMask));
-  __ AndP(r0, result);
-  __ bne(&external_string, Label::kNear);
-
-  // Prepare sequential strings
-  STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
-  __ AddP(string, Operand(SeqTwoByteString::kHeaderSize - kHeapObjectTag));
-  __ b(&check_encoding, Label::kNear);
-
-  // Handle external strings.
-  __ bind(&external_string);
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ mov(r0, Operand(kIsIndirectStringMask));
-    __ AndP(r0, result);
-    __ Assert(eq, kExternalStringExpectedButNotFound, cr0);
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  __ mov(r0, Operand(kShortExternalStringMask));
-  __ AndP(r0, result);
-  __ bne(call_runtime /*, cr0*/);
-  __ LoadP(string,
-           FieldMemOperand(string, ExternalString::kResourceDataOffset));
-
-  Label one_byte, done;
-  __ bind(&check_encoding);
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ mov(r0, Operand(kStringEncodingMask));
-  __ AndP(r0, result);
-  __ bne(&one_byte, Label::kNear);
-  // Two-byte string.
-  __ ShiftLeftP(result, index, Operand(1));
-  __ LoadLogicalHalfWordP(result, MemOperand(string, result));
-  __ b(&done, Label::kNear);
-  __ bind(&one_byte);
-  // One-byte string.
-  __ LoadlB(result, MemOperand(string, index));
-  __ bind(&done);
-}
-
-#undef __
-
 }  // namespace internal
 }  // namespace v8
 

src/s390/codegen-s390.h

-// Copyright 2011 the V8 project authors. All rights reserved.
-//
-// Copyright IBM Corp. 2012, 2015. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef V8_S390_CODEGEN_S390_H_
-#define V8_S390_CODEGEN_S390_H_
-
-#include "src/macro-assembler.h"
-
-namespace v8 {
-namespace internal {
-
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output.
-  static void Generate(MacroAssembler* masm, Register string, Register index,
-                       Register result, Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_S390_CODEGEN_S390_H_

src/v8.gyp

@@ -1501,7 +1501,6 @@
             'arm/code-stubs-arm.cc',
             'arm/code-stubs-arm.h',
             'arm/codegen-arm.cc',
-            'arm/codegen-arm.h',
             'arm/constants-arm.h',
             'arm/constants-arm.cc',
             'arm/cpu-arm.cc',
@@ -1535,7 +1534,6 @@
             'arm64/assembler-arm64.h',
             'arm64/assembler-arm64-inl.h',
             'arm64/codegen-arm64.cc',
-            'arm64/codegen-arm64.h',
             'arm64/code-stubs-arm64.cc',
             'arm64/code-stubs-arm64.h',
             'arm64/constants-arm64.h',
@@ -1585,7 +1583,6 @@
             'ia32/code-stubs-ia32.cc',
             'ia32/code-stubs-ia32.h',
             'ia32/codegen-ia32.cc',
-            'ia32/codegen-ia32.h',
             'ia32/cpu-ia32.cc',
             'ia32/deoptimizer-ia32.cc',
             'ia32/disasm-ia32.cc',
@@ -1614,7 +1611,6 @@
             'mips/assembler-mips.h',
             'mips/assembler-mips-inl.h',
             'mips/codegen-mips.cc',
-            'mips/codegen-mips.h',
             'mips/code-stubs-mips.cc',
             'mips/code-stubs-mips.h',
             'mips/constants-mips.cc',
@@ -1646,7 +1642,6 @@
             'mips64/assembler-mips64.h',
             'mips64/assembler-mips64-inl.h',
             'mips64/codegen-mips64.cc',
-            'mips64/codegen-mips64.h',
             'mips64/code-stubs-mips64.cc',
             'mips64/code-stubs-mips64.h',
             'mips64/constants-mips64.cc',
@@ -1725,7 +1720,6 @@
             'ppc/code-stubs-ppc.cc',
             'ppc/code-stubs-ppc.h',
             'ppc/codegen-ppc.cc',
-            'ppc/codegen-ppc.h',
             'ppc/constants-ppc.h',
             'ppc/constants-ppc.cc',
             'ppc/cpu-ppc.cc',
@@ -1757,7 +1751,6 @@
             's390/assembler-s390.h',
             's390/assembler-s390-inl.h',
             's390/codegen-s390.cc',
-            's390/codegen-s390.h',
             's390/code-stubs-s390.cc',
             's390/code-stubs-s390.h',
             's390/constants-s390.cc',

src/x64/codegen-x64.cc

@@ -41,122 +41,6 @@ UnaryMathFunctionWithIsolate CreateSqrtFunction(Isolate* isolate) {
 
 #undef __
 
-// -------------------------------------------------------------------------
-// Code generators
-
-#define __ ACCESS_MASM(masm)
-
-void StringCharLoadGenerator::Generate(MacroAssembler* masm,
-                                       Register string,
-                                       Register index,
-                                       Register result,
-                                       Label* call_runtime) {
-  Label indirect_string_loaded;
-  __ bind(&indirect_string_loaded);
-
-  // Fetch the instance type of the receiver into result register.
-  __ movp(result, FieldOperand(string, HeapObject::kMapOffset));
-  __ movzxbl(result, FieldOperand(result, Map::kInstanceTypeOffset));
-
-  // We need special handling for indirect strings.
-  Label check_sequential;
-  __ testb(result, Immediate(kIsIndirectStringMask));
-  __ j(zero, &check_sequential, Label::kNear);
-
-  // Dispatch on the indirect string shape: slice or cons.
-  Label cons_string, thin_string;
-  __ andl(result, Immediate(kStringRepresentationMask));
-  __ cmpl(result, Immediate(kConsStringTag));
-  __ j(equal, &cons_string, Label::kNear);
-  __ cmpl(result, Immediate(kThinStringTag));
-  __ j(equal, &thin_string, Label::kNear);
-
-  // Handle slices.
-  __ SmiToInteger32(result, FieldOperand(string, SlicedString::kOffsetOffset));
-  __ addp(index, result);
-  __ movp(string, FieldOperand(string, SlicedString::kParentOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle thin strings.
-  __ bind(&thin_string);
-  __ movp(string, FieldOperand(string, ThinString::kActualOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Handle cons strings.
-  // Check whether the right hand side is the empty string (i.e. if
-  // this is really a flat string in a cons string). If that is not
-  // the case we would rather go to the runtime system now to flatten
-  // the string.
-  __ bind(&cons_string);
-  __ CompareRoot(FieldOperand(string, ConsString::kSecondOffset),
-                 Heap::kempty_stringRootIndex);
-  __ j(not_equal, call_runtime);
-  __ movp(string, FieldOperand(string, ConsString::kFirstOffset));
-  __ jmp(&indirect_string_loaded);
-
-  // Distinguish sequential and external strings. Only these two string
-  // representations can reach here (slices and flat cons strings have been
-  // reduced to the underlying sequential or external string).
-  Label seq_string;
-  __ bind(&check_sequential);
-  STATIC_ASSERT(kSeqStringTag == 0);
-  __ testb(result, Immediate(kStringRepresentationMask));
-  __ j(zero, &seq_string, Label::kNear);
-
-  // Handle external strings.
-  Label one_byte_external, done;
-  if (FLAG_debug_code) {
-    // Assert that we do not have a cons or slice (indirect strings) here.
-    // Sequential strings have already been ruled out.
-    __ testb(result, Immediate(kIsIndirectStringMask));
-    __ Assert(zero, kExternalStringExpectedButNotFound);
-  }
-  // Rule out short external strings.
-  STATIC_ASSERT(kShortExternalStringTag != 0);
-  __ testb(result, Immediate(kShortExternalStringTag));
-  __ j(not_zero, call_runtime);
-  // Check encoding.
-  STATIC_ASSERT(kTwoByteStringTag == 0);
-  __ testb(result, Immediate(kStringEncodingMask));
-  __ movp(result, FieldOperand(string, ExternalString::kResourceDataOffset));
-  __ j(not_equal, &one_byte_external, Label::kNear);
-  // Two-byte string.
-  __ movzxwl(result, Operand(result, index, times_2, 0));
-  __ jmp(&done, Label::kNear);
-  __ bind(&one_byte_external);
-  // One-byte string.
-  __ movzxbl(result, Operand(result, index, times_1, 0));
-  __ jmp(&done, Label::kNear);
-
-  // Dispatch on the encoding: one-byte or two-byte.
-  Label one_byte;
-  __ bind(&seq_string);
-  STATIC_ASSERT((kStringEncodingMask & kOneByteStringTag) != 0);
-  STATIC_ASSERT((kStringEncodingMask & kTwoByteStringTag) == 0);
-  __ testb(result, Immediate(kStringEncodingMask));
-  __ j(not_zero, &one_byte, Label::kNear);
-
-  // Two-byte string.
-  // Load the two-byte character code into the result register.
-  STATIC_ASSERT(kSmiTag == 0 && kSmiTagSize == 1);
-  __ movzxwl(result, FieldOperand(string,
-                                  index,
-                                  times_2,
-                                  SeqTwoByteString::kHeaderSize));
-  __ jmp(&done, Label::kNear);
-
-  // One-byte string.
-  // Load the byte into the result register.
-  __ bind(&one_byte);
-  __ movzxbl(result, FieldOperand(string,
-                                  index,
-                                  times_1,
-                                  SeqOneByteString::kHeaderSize));
-  __ bind(&done);
-}
-
-#undef __
-
 Operand StackArgumentsAccessor::GetArgumentOperand(int index) {
   DCHECK(index >= 0);
   int receiver = (receiver_mode_ == ARGUMENTS_CONTAIN_RECEIVER) ? 1 : 0;

src/x64/codegen-x64.h

@@ -11,22 +11,6 @@ namespace v8 {
 namespace internal {
 
 
-class StringCharLoadGenerator : public AllStatic {
- public:
-  // Generates the code for handling different string types and loading the
-  // indexed character into |result|.  We expect |index| as untagged input and
-  // |result| as untagged output.
-  static void Generate(MacroAssembler* masm,
-                       Register string,
-                       Register index,
-                       Register result,
-                       Label* call_runtime);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(StringCharLoadGenerator);
-};
-
-
 enum StackArgumentsAccessorReceiverMode {
   ARGUMENTS_CONTAIN_RECEIVER,
   ARGUMENTS_DONT_CONTAIN_RECEIVER

test/cctest/interpreter/bytecode_expectations/AsyncGenerators.golden

@@ -23,7 +23,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(0),
                 B(Star), R(1),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(2), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(1),
                 B(Mov), R(closure), R(2),
@@ -150,7 +150,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(0),
                 B(Star), R(1),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(3), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(1),
                 B(Mov), R(closure), R(2),
@@ -301,7 +301,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(10),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(3), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(10),
                 B(Mov), R(closure), R(11),
@@ -344,7 +344,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   36 E> */ B(TestEqualStrictNoFeedback), R(10),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   31 S> */ B(LdaNamedProperty), R(4), U8(8), U8(7),
                 B(Star), R(19),
                 B(CallProperty0), R(19), R(4), U8(5),
@@ -589,7 +589,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(0),
                 B(Star), R(1),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(5), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(1),
                 B(Mov), R(closure), R(2),
@@ -641,7 +641,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
                 B(TestEqualStrictNoFeedback), R(1),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(Ldar), R(7),
                 B(SwitchOnSmiNoFeedback), U8(13), U8(2), I8(1),
                 B(LdaNamedProperty), R(8), U8(15), U8(8),

test/cctest/interpreter/bytecode_expectations/ForAwaitOf.golden

@@ -25,7 +25,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(11),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(3), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(11),
                 B(Mov), R(closure), R(12),
@@ -61,7 +61,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   43 E> */ B(TestEqualStrictNoFeedback), R(11),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   40 S> */ B(LdaNamedProperty), R(4), U8(7), U8(11),
                 B(Star), R(20),
                 B(CallProperty0), R(20), R(4), U8(9),
@@ -313,7 +313,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(11),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(3), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(11),
                 B(Mov), R(closure), R(12),
@@ -349,7 +349,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   43 E> */ B(TestEqualStrictNoFeedback), R(11),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   40 S> */ B(LdaNamedProperty), R(4), U8(7), U8(11),
                 B(Star), R(20),
                 B(CallProperty0), R(20), R(4), U8(9),
@@ -617,7 +617,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(11),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(3), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(11),
                 B(Mov), R(closure), R(12),
@@ -653,7 +653,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   43 E> */ B(TestEqualStrictNoFeedback), R(11),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   40 S> */ B(LdaNamedProperty), R(4), U8(7), U8(11),
                 B(Star), R(20),
                 B(CallProperty0), R(20), R(4), U8(9),

test/cctest/interpreter/bytecode_expectations/ForOfLoop.golden

@@ -656,7 +656,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(3),
                 B(Star), R(11),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(11),
                 B(CreateFunctionContext), U8(1),
@@ -831,7 +831,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(10),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(2), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(10),
                 B(CreateFunctionContext), U8(1),
@@ -873,7 +873,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   35 E> */ B(TestEqualStrictNoFeedback), R(10),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   30 S> */ B(LdaNamedProperty), R(4), U8(6), U8(6),
                 B(Star), R(16),
                 B(CallProperty0), R(16), R(4), U8(4),
@@ -1243,7 +1243,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(11),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(11),
                 B(CreateFunctionContext), U8(1),
@@ -1276,7 +1276,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   40 E> */ B(TestEqualStrictNoFeedback), R(11),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   35 S> */ B(LdaNamedProperty), R(4), U8(3), U8(6),
                 B(Star), R(21),
                 B(CallProperty0), R(21), R(4), U8(4),

test/cctest/interpreter/bytecode_expectations/Generators.golden

@@ -22,7 +22,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(0),
                 B(Star), R(1),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(1),
                 B(Mov), R(closure), R(2),
@@ -70,7 +70,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(0),
                 B(Star), R(1),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(2), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(1),
                 B(Mov), R(closure), R(2),
@@ -139,7 +139,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(10),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(2), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(10),
                 B(Mov), R(closure), R(11),
@@ -177,7 +177,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   30 E> */ B(TestEqualStrictNoFeedback), R(10),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   25 S> */ B(LdaNamedProperty), R(4), U8(7), U8(7),
                 B(Star), R(15),
                 B(CallProperty0), R(15), R(4), U8(5),
@@ -342,7 +342,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(0),
                 B(Star), R(1),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(2), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(1),
                 B(Mov), R(closure), R(2),
@@ -382,7 +382,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
                 B(TestEqualStrictNoFeedback), R(1),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(Ldar), R(3),
                 B(SwitchOnSmiNoFeedback), U8(7), U8(2), I8(1),
                 B(LdaNamedProperty), R(4), U8(9), U8(8),

test/cctest/interpreter/bytecode_expectations/Modules.golden

@@ -22,7 +22,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -79,7 +79,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -138,7 +138,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -218,7 +218,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -296,7 +296,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -376,7 +376,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -454,7 +454,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -516,7 +516,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -590,7 +590,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -647,7 +647,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),
@@ -705,7 +705,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(0),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(0),
                 B(LdaConstant), U8(1),

test/cctest/interpreter/bytecode_expectations/StandardForLoop.golden

@@ -281,7 +281,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(2),
                 B(Star), R(3),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(3),
                 B(Mov), R(closure), R(4),
@@ -342,7 +342,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(2),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(2), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(2),
                 B(Mov), R(closure), R(3),
@@ -370,7 +370,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   31 E> */ B(TestEqualStrictNoFeedback), R(2),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   36 S> */ B(LdaSmi), I8(10),
   /*   36 E> */ B(TestLessThan), R(0), U8(0),
                 B(JumpIfFalse), U8(56),
@@ -518,7 +518,7 @@ bytecodes: [
                 B(RestoreGeneratorState), R(1),
                 B(Star), R(3),
                 B(SwitchOnSmiNoFeedback), U8(0), U8(1), I8(0),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
                 B(LdaSmi), I8(-2),
                 B(Star), R(3),
                 B(Mov), R(closure), R(4),
@@ -537,7 +537,7 @@ bytecodes: [
                 B(LdaSmi), I8(-2),
   /*   36 E> */ B(TestEqualStrictNoFeedback), R(3),
                 B(JumpIfTrue), U8(4),
-                B(Abort), U8(43),
+                B(Abort), U8(42),
   /*   41 S> */ B(LdaSmi), I8(10),
   /*   41 E> */ B(TestLessThan), R(0), U8(0),
                 B(JumpIfFalse), U8(59),