Stop passing metadata table to GC constructor

neildhar · facebook-github-bot · commit ab819e2091c8 · 2021-05-13T11:01:32.000-07:00
Summary:
Now that we don't need to ever pass in a custom metadata table,
remove it from the constructors. Instead, just populate it directly
in the GC constructor.

Reviewed By: dulinriley

Differential Revision: D28405200

fbshipit-source-id: a3f4e9d753656f0e6f3c5df9f98aa8af69531f9e
diff --git a/include/hermes/VM/GCBase.h b/include/hermes/VM/GCBase.h
@@ -958,7 +958,6 @@ class GCBase {
   enum class HeapKind { NCGEN, HADES, MALLOC };
 
   GCBase(
-      MetadataTable metaTable,
       GCCallbacks *gcCallbacks,
       PointerBase *pointerBase,
       const GCConfig &gcConfig,
diff --git a/include/hermes/VM/GCStorage.h b/include/hermes/VM/GCStorage.h
@@ -18,7 +18,6 @@ namespace vm {
 class GCStorage {
  public:
   GCStorage(
-      MetadataTable metaTable,
       GCBase::GCCallbacks *gcCallbacks,
       PointerBase *pointerBase,
       const GCConfig &gcConfig,
@@ -27,7 +26,6 @@ class GCStorage {
       experiments::VMExperimentFlags vmExperimentFlags)
 #ifndef HERMESVM_GC_RUNTIME
       : heap_(
-            metaTable,
             gcCallbacks,
             pointerBase,
             gcConfig,
@@ -44,7 +42,6 @@ class GCStorage {
     switch (heapKind) {
       case GCBase::HeapKind::HADES:
         heap = new (storage_.buffer) HadesGC(
-            metaTable,
             gcCallbacks,
             pointerBase,
             gcConfig,
@@ -54,7 +51,6 @@ class GCStorage {
         break;
       case GCBase::HeapKind::NCGEN:
         heap = new (storage_.buffer) GenGC(
-            metaTable,
             gcCallbacks,
             pointerBase,
             gcConfig,
diff --git a/include/hermes/VM/GenGCNC.h b/include/hermes/VM/GenGCNC.h
@@ -112,7 +112,6 @@ class GenGC final : public GCBase {
   /// sizes.
   /// \param provider A provider of storage to be used by segments.
   GenGC(
-      MetadataTable metaTable,
       GCCallbacks *gcCallbacks,
       PointerBase *pointerBase,
       const GCConfig &gcConfig,
diff --git a/include/hermes/VM/HadesGC.h b/include/hermes/VM/HadesGC.h
@@ -64,7 +64,6 @@ class HadesGC final : public GCBase {
   /// sizes.
   /// \param provider A provider of storage to be used by segments.
   HadesGC(
-      MetadataTable metaTable,
       GCCallbacks *gcCallbacks,
       PointerBase *pointerBase,
       const GCConfig &gcConfig,
diff --git a/include/hermes/VM/MallocGC.h b/include/hermes/VM/MallocGC.h
@@ -146,7 +146,6 @@ class MallocGC final : public GCBase {
   };
 
   MallocGC(
-      MetadataTable metaTable,
       GCCallbacks *gcCallbacks,
       PointerBase *pointerBase,
       const GCConfig &gcConfig,
diff --git a/lib/VM/GCBase.cpp b/lib/VM/GCBase.cpp
@@ -42,13 +42,12 @@ const char GCBase::kNaturalCauseForAnalytics[] = "natural";
 const char GCBase::kHandleSanCauseForAnalytics[] = "handle-san";
 
 GCBase::GCBase(
-    MetadataTable metaTable,
     GCCallbacks *gcCallbacks,
     PointerBase *pointerBase,
     const GCConfig &gcConfig,
     std::shared_ptr<CrashManager> crashMgr,
     HeapKind kind)
-    : metaTable_(metaTable),
+    : metaTable_(getMetadataTable()),
       gcCallbacks_(gcCallbacks),
       pointerBase_(pointerBase),
       crashMgr_(crashMgr),
diff --git a/lib/VM/Runtime.cpp b/lib/VM/Runtime.cpp
@@ -155,7 +155,6 @@ Runtime::Runtime(
       optimizedEval(runtimeConfig.getOptimizedEval()),
       asyncBreakCheckInEval(runtimeConfig.getAsyncBreakCheckInEval()),
       heapStorage_(
-          getMetadataTable(),
           this,
           this,
           runtimeConfig.getGCConfig(),
diff --git a/lib/VM/gcs/GenGCNC.cpp b/lib/VM/gcs/GenGCNC.cpp
@@ -86,15 +86,13 @@ std::pair<gcheapsize_t, gcheapsize_t> GenGC::Size::adjustSize(
 }
 
 GenGC::GenGC(
-    MetadataTable metaTable,
     GCCallbacks *gcCallbacks,
     PointerBase *pointerBase,
     const GCConfig &gcConfig,
     std::shared_ptr<CrashManager> crashMgr,
     std::shared_ptr<StorageProvider> provider,
     experiments::VMExperimentFlags vmExperimentFlags)
     : GCBase(
-          metaTable,
           gcCallbacks,
           pointerBase,
           gcConfig,
diff --git a/lib/VM/gcs/HadesGC.cpp b/lib/VM/gcs/HadesGC.cpp
@@ -1238,15 +1238,13 @@ constexpr double kYGInitialSurvivalRatio = 0.3;
 HadesGC::OldGen::OldGen(HadesGC *gc) : gc_(gc) {}
 
 HadesGC::HadesGC(
-    MetadataTable metaTable,
     GCCallbacks *gcCallbacks,
     PointerBase *pointerBase,
     const GCConfig &gcConfig,
     std::shared_ptr<CrashManager> crashMgr,
     std::shared_ptr<StorageProvider> provider,
     experiments::VMExperimentFlags vmExperimentFlags)
     : GCBase(
-          metaTable,
           gcCallbacks,
           pointerBase,
           gcConfig,
diff --git a/lib/VM/gcs/MallocGC.cpp b/lib/VM/gcs/MallocGC.cpp
@@ -184,15 +184,13 @@ gcheapsize_t MallocGC::Size::minStorageFootprint() const {
 }
 
 MallocGC::MallocGC(
-    MetadataTable metaTable,
     GCCallbacks *gcCallbacks,
     PointerBase *pointerBase,
     const GCConfig &gcConfig,
     std::shared_ptr<CrashManager> crashMgr,
     std::shared_ptr<StorageProvider> provider,
     experiments::VMExperimentFlags vmExperimentFlags)
     : GCBase(
-          metaTable,
           gcCallbacks,
           pointerBase,
           gcConfig,
diff --git a/unittests/VMRuntime/CastingTest.cpp b/unittests/VMRuntime/CastingTest.cpp
@@ -16,7 +16,7 @@ using namespace hermes::vm;
 namespace {
 
 TEST(CastingTest, SmokeTest) {
-  auto rt = DummyRuntime::create(getMetadataTable(), kTestGCConfigSmall);
+  auto rt = DummyRuntime::create(kTestGCConfigSmall);
   DummyRuntime &runtime = *rt;
   GCScope gcScope(&runtime);
 
diff --git a/unittests/VMRuntime/CrashManagerTest.cpp b/unittests/VMRuntime/CrashManagerTest.cpp
@@ -94,10 +94,7 @@ TEST(CrashManagerTest, HeapExtentsCorrect) {
                           .build();
   auto testCrashMgr = std::make_shared<TestCrashManager>();
   auto runtime = DummyRuntime::create(
-      getMetadataTable(),
-      gcConfig,
-      DummyRuntime::defaultProvider(),
-      testCrashMgr);
+      gcConfig, DummyRuntime::defaultProvider(), testCrashMgr);
   DummyRuntime &rt = *runtime;
 
   std::deque<GCCell *> roots;
@@ -241,10 +238,7 @@ TEST(CrashManagerTest, PromotedYGHasCorrectName) {
                           .build();
   auto testCrashMgr = std::make_shared<TestCrashManager>();
   auto runtime = DummyRuntime::create(
-      getMetadataTable(),
-      gcConfig,
-      DummyRuntime::defaultProvider(),
-      testCrashMgr);
+      gcConfig, DummyRuntime::defaultProvider(), testCrashMgr);
   DummyRuntime &rt = *runtime;
 
   std::deque<GCCell *> roots;
@@ -276,10 +270,7 @@ TEST(CrashManagerTest, GCNameIncluded) {
       GCConfig::Builder(kTestGCConfigBuilder).withName("XYZ").build();
   auto testCrashMgr = std::make_shared<TestCrashManager>();
   auto runtime = DummyRuntime::create(
-      getMetadataTable(),
-      gcConfig,
-      DummyRuntime::defaultProvider(),
-      testCrashMgr);
+      gcConfig, DummyRuntime::defaultProvider(), testCrashMgr);
 
   const auto &crashData = testCrashMgr->customData();
   auto gcName = crashData.find("HermesGC");
diff --git a/unittests/VMRuntime/ExternalMemAccountingTest.cpp b/unittests/VMRuntime/ExternalMemAccountingTest.cpp
@@ -43,7 +43,7 @@ TEST_P(ExtMemTests, ExtMemInYoungTest) {
   static const GCConfig kGCConfig =
       TestGCConfigFixedSize(kMaxYoungGenSize * GenGC::kYoungGenFractionDenom);
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
@@ -85,7 +85,7 @@ TEST_P(ExtMemTests, ExtMemInOldByAllocTest) {
   static const GCConfig kGCConfig =
       TestGCConfigFixedSize(kMaxYoungGenSize * GenGC::kYoungGenFractionDenom);
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
@@ -157,7 +157,7 @@ TEST_P(ExtMemTests, ExtMemInOldDirectTest) {
   static const GCConfig kGCConfig =
       TestGCConfigFixedSize(kMaxYoungGenSize * GenGC::kYoungGenFractionDenom);
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
@@ -218,7 +218,7 @@ TEST(ExtMemNonParamTests, ExtMemDoesNotBreakFullGC) {
                           .withMaxHeapSize(kInitSize * 4)
                           .build();
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), gcConfig);
+  auto runtime = DummyRuntime::create(gcConfig);
   DummyRuntime &rt = *runtime;
 
   using SegmentSizeCell = EmptyCell<GenGCHeapSegment::maxSize()>;
@@ -272,7 +272,7 @@ TEST(ExtMemNonParamDeathTest, SaturateYoungGen) {
   ASSERT_GT(kExtAllocSize, kYGSize);
 
   const auto gcConfig = TestGCConfigFixedSize(kTotalSize);
-  auto runtime = DummyRuntime::create(getMetadataTable(), gcConfig);
+  auto runtime = DummyRuntime::create(gcConfig);
   DummyRuntime &rt = *runtime;
 
   std::deque<GCCell *> roots;
diff --git a/unittests/VMRuntime/GCBasicsTest.cpp b/unittests/VMRuntime/GCBasicsTest.cpp
@@ -32,8 +32,7 @@ struct GCBasicsTest : public ::testing::Test {
   std::shared_ptr<DummyRuntime> runtime;
   DummyRuntime &rt;
   GCBasicsTest()
-      : runtime(DummyRuntime::create(getMetadataTable(), kTestGCConfigSmall)),
-        rt(*runtime) {}
+      : runtime(DummyRuntime::create(kTestGCConfigSmall)), rt(*runtime) {}
 };
 
 // Hades doesn't report its stats the same way as other GCs.
@@ -479,7 +478,7 @@ TEST(GCBasicsTestNCGen, TestIDPersistsAcrossMultipleCollections) {
       AlignedHeapSegment::maxSize() * GenGC::kYoungGenFractionDenom;
 
   const GCConfig kGCConfig = TestGCConfigFixedSize(kHeapSizeHint);
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
 
   GCScope scope{&rt};
diff --git a/unittests/VMRuntime/GCFinalizerTest.cpp b/unittests/VMRuntime/GCFinalizerTest.cpp
@@ -34,7 +34,7 @@ static DummyObject *createWithFinalizeCount(GC *gc, int *numFinalized) {
 
 TEST(GCFinalizerTest, NoDeadFinalizables) {
   int finalized = 0;
-  auto runtime = DummyRuntime::create(getMetadataTable(), kTestGCConfigSmall);
+  auto runtime = DummyRuntime::create(kTestGCConfigSmall);
   DummyRuntime &rt = *runtime;
 
   DummyObject::create(&rt.getHeap());
@@ -47,7 +47,7 @@ TEST(GCFinalizerTest, NoDeadFinalizables) {
 
 TEST(GCFinalizerTest, FinalizablesOnly) {
   int finalized = 0;
-  auto runtime = DummyRuntime::create(getMetadataTable(), kTestGCConfigSmall);
+  auto runtime = DummyRuntime::create(kTestGCConfigSmall);
   DummyRuntime &rt = *runtime;
 
   createWithFinalizeCount(&rt.getHeap(), &finalized);
@@ -60,7 +60,7 @@ TEST(GCFinalizerTest, FinalizablesOnly) {
 
 TEST(GCFinalizerTest, MultipleCollect) {
   int finalized = 0;
-  auto runtime = DummyRuntime::create(getMetadataTable(), kTestGCConfigSmall);
+  auto runtime = DummyRuntime::create(kTestGCConfigSmall);
   DummyRuntime &rt = *runtime;
 
   createWithFinalizeCount(&rt.getHeap(), &finalized);
@@ -83,7 +83,7 @@ TEST(GCFinalizerTest, MultipleCollect) {
 TEST(GCFinalizerTest, FinalizeAllOnRuntimeDestructDummyRuntime) {
   int finalized = 0;
   {
-    auto rt = DummyRuntime::create(getMetadataTable(), kTestGCConfigSmall);
+    auto rt = DummyRuntime::create(kTestGCConfigSmall);
 
     GCCell *r1 = createWithFinalizeCount(&rt->getHeap(), &finalized);
     GCCell *r2 = createWithFinalizeCount(&rt->getHeap(), &finalized);
diff --git a/unittests/VMRuntime/GCFragmentationTest.cpp b/unittests/VMRuntime/GCFragmentationTest.cpp
@@ -32,7 +32,7 @@ TEST(GCFragmentationTest, TestCoalescing) {
   static const size_t kHeapSize = AlignedHeapSegment::maxSize() * kNumSegments;
   static const GCConfig kGCConfig = TestGCConfigFixedSize(kHeapSize);
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
 
   using SixteenthCell = EmptyCell<AlignedHeapSegment::maxSize() / 16>;
@@ -80,7 +80,7 @@ TEST(GCFragmentationTest, Test) {
 
   static const GCConfig kGCConfig = TestGCConfigFixedSize(kHeapSizeHint);
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
@@ -157,7 +157,7 @@ TEST(GCFragmentationTest, ExternalMemoryTest) {
   // \c kHeapSize bytes in total.
   static constexpr size_t kOGSize = kHeapSize - GenGCHeapSegment::maxSize();
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
diff --git a/unittests/VMRuntime/GCGuardPageNCTest.cpp b/unittests/VMRuntime/GCGuardPageNCTest.cpp
@@ -26,8 +26,7 @@ TEST(GCGuardPageNCTest, ObjectUnderflow) {
 
   // Use an mmap-based storage for this test.
   std::unique_ptr<StorageProvider> provider = StorageProvider::mmapProvider();
-  auto runtime =
-      DummyRuntime::create(getMetadataTable(), kGCConfig, std::move(provider));
+  auto runtime = DummyRuntime::create(kGCConfig, std::move(provider));
   DummyRuntime &rt = *runtime;
 
   // Allocate the first cell in the segment and try to write directly before it.
diff --git a/unittests/VMRuntime/GCInitTest.cpp b/unittests/VMRuntime/GCInitTest.cpp
@@ -38,7 +38,7 @@ TEST_P(GCInitTests, InitSizeTest) {
                         .withMaxHeapSize(32 * kM)
                         .build();
 
-  auto runtime = DummyRuntime::create(getMetadataTable(), config);
+  auto runtime = DummyRuntime::create(config);
   oscompat::reset_test_page_size();
 }
 
diff --git a/unittests/VMRuntime/GCLazySegmentNCTest.cpp b/unittests/VMRuntime/GCLazySegmentNCTest.cpp
@@ -47,7 +47,7 @@ using SegmentCell = EmptyCell<GenGCHeapSegment::maxSize()>;
 
 /// We are able to materialize every segment.
 TEST_F(GCLazySegmentNCTest, MaterializeAll) {
-  auto runtime = DummyRuntime::create(getMetadataTable(), kGCConfig);
+  auto runtime = DummyRuntime::create(kGCConfig);
   DummyRuntime &rt = *runtime;
 
   std::deque<GCCell *> roots;
@@ -64,8 +64,7 @@ TEST_F(GCLazySegmentNCTest, MaterializeAll) {
 TEST_F(GCLazySegmentNCTest, MaterializeEnough) {
   auto provider = std::make_unique<LimitedStorageProvider>(
       DummyRuntime::defaultProvider(), kHeapVALimited);
-  auto runtime =
-      DummyRuntime::create(getMetadataTable(), kGCConfig, std::move(provider));
+  auto runtime = DummyRuntime::create(kGCConfig, std::move(provider));
   DummyRuntime &rt = *runtime;
 
   std::deque<GCCell *> roots;
@@ -83,8 +82,7 @@ TEST_F(GCLazySegmentNCTest, MaterializeEnough) {
 TEST_F(GCLazySegmentNCTest, YoungGenNoMaterialize) {
   auto provider = std::make_unique<LimitedStorageProvider>(
       DummyRuntime::defaultProvider(), kHeapVALimited);
-  auto runtime =
-      DummyRuntime::create(getMetadataTable(), kGCConfig, std::move(provider));
+  auto runtime = DummyRuntime::create(kGCConfig, std::move(provider));
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
@@ -126,8 +124,7 @@ TEST_F(GCLazySegmentNCTest, OldGenAllocMaterialize) {
                               .build();
   auto provider = DummyRuntime::defaultProvider();
   auto &counter = *provider;
-  auto runtime =
-      DummyRuntime::create(getMetadataTable(), config, std::move(provider));
+  auto runtime = DummyRuntime::create(config, std::move(provider));
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
@@ -156,8 +153,7 @@ TEST_F(GCLazySegmentNCTest, OldGenAllocMaterialize) {
 TEST_F(GCLazySegmentNCDeathTest, FailToMaterialize) {
   auto provider = std::make_unique<LimitedStorageProvider>(
       DummyRuntime::defaultProvider(), kHeapVALimited);
-  auto runtime =
-      DummyRuntime::create(getMetadataTable(), kGCConfig, std::move(provider));
+  auto runtime = DummyRuntime::create(kGCConfig, std::move(provider));
   DummyRuntime &rt = *runtime;
 
   std::deque<GCCell *> roots;
@@ -174,8 +170,7 @@ TEST_F(GCLazySegmentNCDeathTest, FailToMaterialize) {
 TEST_F(GCLazySegmentNCDeathTest, FailToMaterializeContinue) {
   auto provider = std::make_unique<LimitedStorageProvider>(
       DummyRuntime::defaultProvider(), kHeapVALimited);
-  auto runtime =
-      DummyRuntime::create(getMetadataTable(), kGCConfig, std::move(provider));
+  auto runtime = DummyRuntime::create(kGCConfig, std::move(provider));
   DummyRuntime &rt = *runtime;
   GenGC &gc = rt.getHeap();
 
diff --git a/unittests/VMRuntime/GCMarkWeakTest.cpp b/unittests/VMRuntime/GCMarkWeakTest.cpp
@@ -48,7 +48,7 @@ TEST(GCMarkWeakTest, MarkWeak) {
 #endif
       ;
   int numMarkWeakCalls = 0;
-  auto runtime = DummyRuntime::create(getMetadataTable(), kTestGCConfigSmall);
+  auto runtime = DummyRuntime::create(kTestGCConfigSmall);
   DummyRuntime &rt = *runtime;
   auto &gc = rt.getHeap();
   // Probably zero, but we only care about the increase/decrease.
diff --git a/unittests/VMRuntime/GCOOMTest.cpp b/unittests/VMRuntime/GCOOMTest.cpp
diff --git a/unittests/VMRuntime/GCObjectIterationTest.cpp b/unittests/VMRuntime/GCObjectIterationTest.cpp
diff --git a/unittests/VMRuntime/GCReturnUnusedMemoryTest.cpp b/unittests/VMRuntime/GCReturnUnusedMemoryTest.cpp
diff --git a/unittests/VMRuntime/GCSanitizeHandlesTest.cpp b/unittests/VMRuntime/GCSanitizeHandlesTest.cpp
diff --git a/unittests/VMRuntime/GCSizingTest.cpp b/unittests/VMRuntime/GCSizingTest.cpp
diff --git a/unittests/VMRuntime/HeapSnapshotTest.cpp b/unittests/VMRuntime/HeapSnapshotTest.cpp
diff --git a/unittests/VMRuntime/InstrumentationAPITest.cpp b/unittests/VMRuntime/InstrumentationAPITest.cpp
diff --git a/unittests/VMRuntime/TestHelpers.cpp b/unittests/VMRuntime/TestHelpers.cpp
diff --git a/unittests/VMRuntime/TestHelpers.h b/unittests/VMRuntime/TestHelpers.h
