[builtins] unify builtins list.

src/external-reference-table.cc

 // Copyright 2016 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.
 
 #include "src/external-reference-table.h"
 
 #include "src/accessors.h"
 #include "src/assembler.h"
 #include "src/counters.h"
 #include "src/deoptimizer.h"
@@ skipping 230 matching lines @@
   // rewritten to be mostly table driven, as the callback macro style tends to
   // very easily cause code bloat.  Please be careful in the future when adding
   // new references.
 
   struct RefTableEntry {
     uint16_t id;
     const char* name;
   };
 
   static const RefTableEntry c_builtins[] = {
-#define DEF_ENTRY_C(name, ignore) {Builtins::c_##name, "Builtins::" #name},
-      BUILTIN_LIST_C(DEF_ENTRY_C)
-#undef DEF_ENTRY_C
+#define DEF_ENTRY(name) {Builtins::c_##name, "Builtins::" #name},
+      BUILTIN_LIST_C(DEF_ENTRY)
+#undef DEF_ENTRY
   };
 
   for (unsigned i = 0; i < arraysize(c_builtins); ++i) {
     ExternalReference ref(static_cast<Builtins::CFunctionId>(c_builtins[i].id),
                           isolate);
     Add(ref.address(), c_builtins[i].name);
   }
 
   static const RefTableEntry builtins[] = {
-#define DEF_ENTRY_C(name, ignore) {Builtins::k##name, "Builtins::" #name},
-#define DEF_ENTRY_A(name, i1, i2) {Builtins::k##name, "Builtins::" #name},
-      BUILTIN_LIST_C(DEF_ENTRY_C) BUILTIN_LIST_A(DEF_ENTRY_A)
-          BUILTIN_LIST_DEBUG_A(DEF_ENTRY_A)
-#undef DEF_ENTRY_C
-#undef DEF_ENTRY_A
+#define DEF_ENTRY(name, ...) {Builtins::k##name, "Builtins::" #name},
+      BUILTIN_LIST_C(DEF_ENTRY) BUILTIN_LIST_A(DEF_ENTRY)
+#undef DEF_ENTRY
   };
 
   for (unsigned i = 0; i < arraysize(builtins); ++i) {
     ExternalReference ref(static_cast<Builtins::Name>(builtins[i].id), isolate);
     Add(ref.address(), builtins[i].name);
   }
 
   static const RefTableEntry runtime_functions[] = {
 #define RUNTIME_ENTRY(name, i1, i2) {Runtime::k##name, "Runtime::" #name},
       FOR_EACH_INTRINSIC(RUNTIME_ENTRY)
@@ skipping 131 matching lines @@
   if (api_external_references != nullptr) {
     while (*api_external_references != 0) {
       Add(reinterpret_cast<Address>(*api_external_references), "<embedder>");
       api_external_references++;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace v8