[builtins] remove redundant builtins lists.

src/builtins/builtins.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_BUILTINS_BUILTINS_H_
 #define V8_BUILTINS_BUILTINS_H_
 
 #include "src/base/flags.h"
 #include "src/handles.h"
 
@@ skipping 374 matching lines @@
 #define BUILTIN_LIST_ALL(V) BUILTIN_LIST(V, V, V, V, V, V, V)
 
 #define BUILTIN_LIST_C(V)                                            \
   BUILTIN_LIST(V, V, IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, \
                IGNORE_BUILTIN, IGNORE_BUILTIN)
 
 #define BUILTIN_LIST_A(V)                                                      \
   BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, \
                V, V, V)
 
-#define BUILTIN_LIST_TFS(V)                                       \
-  BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, V, \
-               IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN)
-
 #define BUILTIN_LIST_DBG(V)                                                    \
   BUILTIN_LIST(IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, IGNORE_BUILTIN, \
                IGNORE_BUILTIN, IGNORE_BUILTIN, V)
 
 // Forward declarations.
 class CodeStubAssembler;
-class BuiltinFunctionTable;
 class ObjectVisitor;
 
 class Builtins {
  public:
   ~Builtins();
 
   // Generate all builtin code objects. Should be called once during
   // isolate initialization.
   void SetUp(Isolate* isolate, bool create_heap_objects);
   void TearDown();
 
   // Garbage collection support.
   void IterateBuiltins(ObjectVisitor* v);
 
   // Disassembler support.
   const char* Lookup(byte* pc);
 
   enum Name {
-#define DEF_ENUM(name, ...) k##name,
+#define DEF_ENUM(Name, ...) k##Name,
     BUILTIN_LIST_ALL(DEF_ENUM)
 #undef DEF_ENUM
         builtin_count
   };
 
-  enum CFunctionId {
-#define DEF_ENUM(name) c_##name,
-    BUILTIN_LIST_C(DEF_ENUM)
-#undef DEF_ENUM
-        cfunction_count
-  };
-
-#define DECLARE_BUILTIN_ACCESSOR(name, ...) Handle<Code> name();
+#define DECLARE_BUILTIN_ACCESSOR(Name, ...) Handle<Code> Name();
   BUILTIN_LIST_ALL(DECLARE_BUILTIN_ACCESSOR)
 #undef DECLARE_BUILTIN_ACCESSOR
 
   // Convenience wrappers.
   Handle<Code> CallFunction(
       ConvertReceiverMode = ConvertReceiverMode::kAny,
       TailCallMode tail_call_mode = TailCallMode::kDisallow);
   Handle<Code> Call(ConvertReceiverMode = ConvertReceiverMode::kAny,
                     TailCallMode tail_call_mode = TailCallMode::kDisallow);
   Handle<Code> CallBoundFunction(TailCallMode tail_call_mode);
   Handle<Code> NonPrimitiveToPrimitive(
       ToPrimitiveHint hint = ToPrimitiveHint::kDefault);
   Handle<Code> OrdinaryToPrimitive(OrdinaryToPrimitiveHint hint);
   Handle<Code> InterpreterPushArgsAndCall(
       TailCallMode tail_call_mode,
       CallableType function_type = CallableType::kAny);
 
   Code* builtin(Name name) {
     // Code::cast cannot be used here since we access builtins
     // during the marking phase of mark sweep. See IC::Clear.
     return reinterpret_cast<Code*>(builtins_[name]);
   }
 
   Address builtin_address(Name name) {
     return reinterpret_cast<Address>(&builtins_[name]);
   }
 
-  static Address c_function_address(CFunctionId id) { return c_functions_[id]; }
-
-  const char* name(int index) {
-    DCHECK(index >= 0);
-    DCHECK(index < builtin_count);
-    return names_[index];
-  }
+  const char* name(int index);
 
   bool is_initialized() const { return initialized_; }
 
   MUST_USE_RESULT static MaybeHandle<Object> InvokeApiFunction(
       Isolate* isolate, Handle<HeapObject> function, Handle<Object> receiver,
       int argc, Handle<Object> args[]);
 
   enum ExitFrameType { EXIT, BUILTIN_EXIT };
 
+  static void Generate_Adaptor(MacroAssembler* masm, Address builtin_address,
+                               ExitFrameType exit_frame_type);
+
  private:
   Builtins();
 
-  // The external C++ functions called from the code.
-  static Address const c_functions_[cfunction_count];
-
-  // Note: These are always Code objects, but to conform with
-  // IterateBuiltins() above which assumes Object**'s for the callback
-  // function f, we use an Object* array here.
-  Object* builtins_[builtin_count];
-  const char* names_[builtin_count];
-
-  static void Generate_Adaptor(MacroAssembler* masm, CFunctionId id,
-                               ExitFrameType exit_frame_type);
   static void Generate_AllocateInNewSpace(MacroAssembler* masm);
   static void Generate_AllocateInOldSpace(MacroAssembler* masm);
   static void Generate_ConstructedNonConstructable(MacroAssembler* masm);
   static void Generate_InstantiateAsmJs(MacroAssembler* masm);
   static void Generate_CompileLazy(MacroAssembler* masm);
   static void Generate_CompileBaseline(MacroAssembler* masm);
   static void Generate_InOptimizationQueue(MacroAssembler* masm);
   static void Generate_CompileOptimized(MacroAssembler* masm);
   static void Generate_CompileOptimizedConcurrent(MacroAssembler* masm);
   static void Generate_JSConstructStubGeneric(MacroAssembler* masm);
@@ skipping 311 matching lines @@
   CODE_AGE_LIST(DECLARE_CODE_AGE_BUILTIN_GENERATOR)
 #undef DECLARE_CODE_AGE_BUILTIN_GENERATOR
 
   static void Generate_MarkCodeAsToBeExecutedOnce(MacroAssembler* masm);
   static void Generate_MarkCodeAsExecutedOnce(MacroAssembler* masm);
   static void Generate_MarkCodeAsExecutedTwice(MacroAssembler* masm);
 
   static void Generate_AtomicsLoad(CodeStubAssembler* assembler);
   static void Generate_AtomicsStore(CodeStubAssembler* assembler);
 
-  static void InitBuiltinFunctionTable();
-
+  // Note: These are always Code objects, but to conform with
+  // IterateBuiltins() above which assumes Object**'s for the callback
+  // function f, we use an Object* array here.
+  Object* builtins_[builtin_count];
   bool initialized_;
 
-  friend class BuiltinFunctionTable;
   friend class Isolate;
 
   DISALLOW_COPY_AND_ASSIGN(Builtins);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_BUILTINS_BUILTINS_H_