[cleanup] Free 400 targets from the draconic reign of..

..ordered-hash-table.h.

Bug: v8:8834
Change-Id: Ibb79006beb020d06bc516d9a2dac81015a403728
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1538518Reviewed-by: Georg Neis <neis@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60461}

src/compiler/effect-control-linearizer.cc

@@ -17,6 +17,7 @@
 #include "src/heap/factory-inl.h"
 #include "src/objects/heap-number.h"
 #include "src/objects/oddball.h"
+#include "src/objects/ordered-hash-table.h"
 
 #include "src/ptr-compr-inl.h"
 

src/compiler/js-create-lowering.cc

@@ -25,6 +25,7 @@
 #include "src/objects/js-generator.h"
 #include "src/objects/js-promise.h"
 #include "src/objects/js-regexp-inl.h"
+#include "src/objects/ordered-hash-table.h"
 
 namespace v8 {
 namespace internal {

src/globals.h

@@ -1578,6 +1578,9 @@ enum class StubCallMode {
 constexpr int kFunctionLiteralIdInvalid = -1;
 constexpr int kFunctionLiteralIdTopLevel = 0;
 
+constexpr int kSmallOrderedHashSetMinCapacity = 4;
+constexpr int kSmallOrderedHashMapMinCapacity = 4;
+
 }  // namespace internal
 }  // namespace v8
 

src/heap/factory.h

@@ -18,7 +18,6 @@
 #include "src/objects/dictionary.h"
 #include "src/objects/js-array.h"
 #include "src/objects/js-regexp.h"
-#include "src/objects/ordered-hash-table.h"
 #include "src/objects/string.h"
 
 namespace v8 {
@@ -200,13 +199,13 @@ class V8_EXPORT_PRIVATE Factory {
   Handle<OrderedNameDictionary> NewOrderedNameDictionary();
 
   Handle<SmallOrderedHashSet> NewSmallOrderedHashSet(
-      int capacity = SmallOrderedHashSet::kMinCapacity,
+      int capacity = kSmallOrderedHashSetMinCapacity,
       AllocationType allocation = AllocationType::kYoung);
   Handle<SmallOrderedHashMap> NewSmallOrderedHashMap(
-      int capacity = SmallOrderedHashMap::kMinCapacity,
+      int capacity = kSmallOrderedHashMapMinCapacity,
       AllocationType allocation = AllocationType::kYoung);
   Handle<SmallOrderedNameDictionary> NewSmallOrderedNameDictionary(
-      int capacity = SmallOrderedHashMap::kMinCapacity,
+      int capacity = kSmallOrderedHashMapMinCapacity,
       AllocationType allocation = AllocationType::kYoung);
 
   // Create a new PrototypeInfo struct.

src/heap/setup-heap-internal.cc

@@ -32,6 +32,7 @@
 #include "src/objects/microtask.h"
 #include "src/objects/module.h"
 #include "src/objects/oddball-inl.h"
+#include "src/objects/ordered-hash-table.h"
 #include "src/objects/promise.h"
 #include "src/objects/script.h"
 #include "src/objects/shared-function-info.h"

src/json-stringifier.cc

@@ -11,6 +11,7 @@
 #include "src/objects/heap-number-inl.h"
 #include "src/objects/js-array-inl.h"
 #include "src/objects/oddball-inl.h"
+#include "src/objects/ordered-hash-table.h"
 #include "src/objects/smi.h"
 #include "src/string-builder-inl.h"
 #include "src/utils.h"

src/objects/ordered-hash-table.h

@@ -595,6 +595,9 @@ class SmallOrderedHashSet : public SmallOrderedHashTable<SmallOrderedHashSet> {
                       SmallOrderedHashTable<SmallOrderedHashSet>);
 };
 
+STATIC_ASSERT(kSmallOrderedHashSetMinCapacity ==
+              SmallOrderedHashSet::kMinCapacity);
+
 class SmallOrderedHashMap : public SmallOrderedHashTable<SmallOrderedHashMap> {
  public:
   DECL_CAST(SmallOrderedHashMap)
@@ -625,6 +628,9 @@ class SmallOrderedHashMap : public SmallOrderedHashTable<SmallOrderedHashMap> {
                       SmallOrderedHashTable<SmallOrderedHashMap>);
 };
 
+STATIC_ASSERT(kSmallOrderedHashMapMinCapacity ==
+              SmallOrderedHashMap::kMinCapacity);
+
 // TODO(gsathya): Rename this to OrderedHashTable, after we rename
 // OrderedHashTable to LargeOrderedHashTable. Also set up a
 // OrderedHashSetBase class as a base class for the two tables and use

test/cctest/test-hashcode.cc

@@ -8,6 +8,7 @@
 
 #include "src/objects-inl.h"
 #include "src/objects.h"
+#include "src/objects/ordered-hash-table.h"
 #include "src/third_party/siphash/halfsiphash.h"
 #include "src/utils.h"
 #include "src/v8.h"