[torque] fully port UncompiledData classes

Drive-by change: Fix wrong reference to FixedRangeBodyDescriptor in
                 implementation-visitor.cc

TBR: ulan@chromium.org
Change-Id: I8a1f468f35c38f5be1f4e8d1cfcc9f0fd2a16381
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2540546
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Auto-Submit: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/master@{#71223}

src/diagnostics/objects-printer.cc

@@ -2330,23 +2330,6 @@ void PreparseData::PreparseDataPrint(std::ostream& os) {  // NOLINT
   os << "\n";
 }
 
-void UncompiledDataWithoutPreparseData::UncompiledDataWithoutPreparseDataPrint(
-    std::ostream& os) {  // NOLINT
-  PrintHeader(os, "UncompiledDataWithoutPreparseData");
-  os << "\n - start position: " << start_position();
-  os << "\n - end position: " << end_position();
-  os << "\n";
-}
-
-void UncompiledDataWithPreparseData::UncompiledDataWithPreparseDataPrint(
-    std::ostream& os) {  // NOLINT
-  PrintHeader(os, "UncompiledDataWithPreparseData");
-  os << "\n - start position: " << start_position();
-  os << "\n - end position: " << end_position();
-  os << "\n - preparse_data: " << Brief(preparse_data());
-  os << "\n";
-}
-
 void InterpreterData::InterpreterDataPrint(std::ostream& os) {  // NOLINT
   PrintHeader(os, "InterpreterData");
   os << "\n - bytecode_array: " << Brief(bytecode_array());

src/heap/factory-base.cc

@@ -275,14 +275,8 @@ Handle<UncompiledDataWithoutPreparseData>
 FactoryBase<Impl>::NewUncompiledDataWithoutPreparseData(
     Handle<String> inferred_name, int32_t start_position,
     int32_t end_position) {
-  Handle<UncompiledDataWithoutPreparseData> result = handle(
-      UncompiledDataWithoutPreparseData::cast(NewWithImmortalMap(
-          impl()->read_only_roots().uncompiled_data_without_preparse_data_map(),
-          AllocationType::kOld)),
-      isolate());
-
-  result->Init(impl(), *inferred_name, start_position, end_position);
-  return result;
+  return TorqueGeneratedFactory<Impl>::NewUncompiledDataWithoutPreparseData(
+      inferred_name, start_position, end_position, AllocationType::kOld);
 }
 
 template <typename Impl>
@@ -290,16 +284,9 @@ Handle<UncompiledDataWithPreparseData>
 FactoryBase<Impl>::NewUncompiledDataWithPreparseData(
     Handle<String> inferred_name, int32_t start_position, int32_t end_position,
     Handle<PreparseData> preparse_data) {
-  Handle<UncompiledDataWithPreparseData> result = handle(
-      UncompiledDataWithPreparseData::cast(NewWithImmortalMap(
-          impl()->read_only_roots().uncompiled_data_with_preparse_data_map(),
-          AllocationType::kOld)),
-      isolate());
-
-  result->Init(impl(), *inferred_name, start_position, end_position,
-               *preparse_data);
-
-  return result;
+  return TorqueGeneratedFactory<Impl>::NewUncompiledDataWithPreparseData(
+      inferred_name, start_position, end_position, preparse_data,
+      AllocationType::kOld);
 }
 
 template <typename Impl>

src/heap/objects-visiting.h

@@ -51,8 +51,6 @@ namespace internal {
   V(Symbol)                            \
   V(SyntheticModule)                   \
   V(TransitionArray)                   \
-  V(UncompiledDataWithoutPreparseData) \
-  V(UncompiledDataWithPreparseData)    \
   V(WasmArray)                         \
   V(WasmIndirectFunctionTable)         \
   V(WasmInstanceObject)                \

src/heap/setup-heap-internal.cc

@@ -495,12 +495,6 @@ bool Heap::CreateInitialMaps() {
                  next_call_side_effect_free_call_handler_info)
 
     ALLOCATE_VARSIZE_MAP(PREPARSE_DATA_TYPE, preparse_data)
-    ALLOCATE_MAP(UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE,
-                 UncompiledDataWithoutPreparseData::kSize,
-                 uncompiled_data_without_preparse_data)
-    ALLOCATE_MAP(UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE,
-                 UncompiledDataWithPreparseData::kSize,
-                 uncompiled_data_with_preparse_data)
     ALLOCATE_MAP(SHARED_FUNCTION_INFO_TYPE, SharedFunctionInfo::kAlignedSize,
                  shared_function_info)
     ALLOCATE_MAP(SOURCE_TEXT_MODULE_TYPE, SourceTextModule::kSize,

src/objects/instance-type.h

@@ -277,11 +277,6 @@ TYPED_ARRAYS(TYPED_ARRAY_IS_TYPE_FUNCTION_DECL)
   V(_, SymbolMap, symbol_map, Symbol)                                       \
   V(_, TransitionArrayMap, transition_array_map, TransitionArray)           \
   V(_, Tuple2Map, tuple2_map, Tuple2)                                       \
-  V(_, UncompiledDataWithoutPreparseDataMap,                                \
-    uncompiled_data_without_preparse_data_map,                              \
-    UncompiledDataWithoutPreparseData)                                      \
-  V(_, UncompiledDataWithPreparseDataMap,                                   \
-    uncompiled_data_with_preparse_data_map, UncompiledDataWithPreparseData) \
   V(_, WeakFixedArrayMap, weak_fixed_array_map, WeakFixedArray)             \
   TORQUE_DEFINED_MAP_CSA_LIST_GENERATOR(V, _)
 

src/objects/map.cc

@@ -248,12 +248,6 @@ VisitorId Map::GetVisitorId(Map map) {
     case PREPARSE_DATA_TYPE:
       return kVisitPreparseData;
 
-    case UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE:
-      return kVisitUncompiledDataWithoutPreparseData;
-
-    case UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE:
-      return kVisitUncompiledDataWithPreparseData;
-
     case COVERAGE_INFO_TYPE:
       return kVisitCoverageInfo;
 

src/objects/map.h

@@ -68,8 +68,6 @@ enum InstanceType : uint16_t;
   V(Symbol)                            \
   V(SyntheticModule)                   \
   V(TransitionArray)                   \
-  V(UncompiledDataWithoutPreparseData) \
-  V(UncompiledDataWithPreparseData)    \
   V(WasmIndirectFunctionTable)         \
   V(WasmInstanceObject)                \
   V(WasmArray)                         \

src/objects/object-list-macros.h

@@ -215,9 +215,6 @@ class ZoneForwardList;
   V(TemplateList)                              \
   V(ThinString)                                \
   V(TransitionArray)                           \
-  V(UncompiledData)                            \
-  V(UncompiledDataWithPreparseData)            \
-  V(UncompiledDataWithoutPreparseData)         \
   V(Undetectable)                              \
   V(UniqueName)                                \
   V(WasmArray)                                 \

src/objects/objects-body-descriptors-inl.h

@@ -1062,12 +1062,6 @@ ReturnType BodyDescriptorApply(InstanceType type, T1 p1, T2 p2, T3 p3, T4 p4) {
                                                                    p4);
     case PREPARSE_DATA_TYPE:
       return Op::template apply<PreparseData::BodyDescriptor>(p1, p2, p3, p4);
-    case UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE:
-      return Op::template apply<
-          UncompiledDataWithoutPreparseData::BodyDescriptor>(p1, p2, p3, p4);
-    case UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE:
-      return Op::template apply<UncompiledDataWithPreparseData::BodyDescriptor>(
-          p1, p2, p3, p4);
     case HEAP_NUMBER_TYPE:
     case FILLER_TYPE:
     case BYTE_ARRAY_TYPE:

src/objects/shared-function-info-inl.h

@@ -644,14 +644,6 @@ void SharedFunctionInfo::ClearPreparseData() {
   DCHECK(HasUncompiledDataWithoutPreparseData());
 }
 
-template <typename LocalIsolate>
-void UncompiledData::Init(LocalIsolate* isolate, String inferred_name,
-                          int start_position, int end_position) {
-  set_inferred_name(inferred_name);
-  set_start_position(start_position);
-  set_end_position(end_position);
-}
-
 void UncompiledData::InitAfterBytecodeFlush(
     String inferred_name, int start_position, int end_position,
     std::function<void(HeapObject object, ObjectSlot slot, HeapObject target)>
@@ -663,16 +655,6 @@ void UncompiledData::InitAfterBytecodeFlush(
   set_end_position(end_position);
 }
 
-template <typename LocalIsolate>
-void UncompiledDataWithPreparseData::Init(LocalIsolate* isolate,
-                                          String inferred_name,
-                                          int start_position, int end_position,
-                                          PreparseData scope_data) {
-  this->UncompiledData::Init(isolate, inferred_name, start_position,
-                             end_position);
-  set_preparse_data(scope_data);
-}
-
 bool SharedFunctionInfo::HasWasmExportedFunctionData() const {
   return function_data(kAcquireLoad).IsWasmExportedFunctionData();
 }

src/objects/shared-function-info.h

@@ -101,19 +101,11 @@ class PreparseData
 class UncompiledData
     : public TorqueGeneratedUncompiledData<UncompiledData, HeapObject> {
  public:
-  template <typename LocalIsolate>
-  inline void Init(LocalIsolate* isolate, String inferred_name,
-                   int start_position, int end_position);
-
   inline void InitAfterBytecodeFlush(
       String inferred_name, int start_position, int end_position,
       std::function<void(HeapObject object, ObjectSlot slot, HeapObject target)>
           gc_notify_updated_slot);
 
-  using BodyDescriptor =
-      FixedBodyDescriptor<kStartOfStrongFieldsOffset, kEndOfStrongFieldsOffset,
-                          kHeaderSize>;
-
   TQ_OBJECT_CONSTRUCTORS(UncompiledData)
 };
 
@@ -124,10 +116,7 @@ class UncompiledDataWithoutPreparseData
     : public TorqueGeneratedUncompiledDataWithoutPreparseData<
           UncompiledDataWithoutPreparseData, UncompiledData> {
  public:
-  DECL_PRINTER(UncompiledDataWithoutPreparseData)
-
-  // No extra fields compared to UncompiledData.
-  using BodyDescriptor = UncompiledData::BodyDescriptor;
+  class BodyDescriptor;
 
   TQ_OBJECT_CONSTRUCTORS(UncompiledDataWithoutPreparseData)
 };
@@ -138,17 +127,7 @@ class UncompiledDataWithPreparseData
     : public TorqueGeneratedUncompiledDataWithPreparseData<
           UncompiledDataWithPreparseData, UncompiledData> {
  public:
-  DECL_PRINTER(UncompiledDataWithPreparseData)
-
-  template <typename LocalIsolate>
-  inline void Init(LocalIsolate* isolate, String inferred_name,
-                   int start_position, int end_position,
-                   PreparseData scope_data);
-
-  using BodyDescriptor = SubclassBodyDescriptor<
-      UncompiledData::BodyDescriptor,
-      FixedBodyDescriptor<kStartOfStrongFieldsOffset, kEndOfStrongFieldsOffset,
-                          kSize>>;
+  class BodyDescriptor;
 
   TQ_OBJECT_CONSTRUCTORS(UncompiledDataWithPreparseData)
 };

src/objects/shared-function-info.tq

@@ -63,19 +63,22 @@ extern class SharedFunctionInfo extends HeapObject {
 }
 
 @abstract
-@generateCppClass
-extern class UncompiledData extends HeapObject {
+@export
+@customCppClass
+class UncompiledData extends HeapObject {
   inferred_name: String;
   start_position: int32;
   end_position: int32;
 }
 
-@generateCppClass
-extern class UncompiledDataWithoutPreparseData extends UncompiledData {
+@export
+@customCppClass
+class UncompiledDataWithoutPreparseData extends UncompiledData {
 }
 
-@generateCppClass
-extern class UncompiledDataWithPreparseData extends UncompiledData {
+@export
+@customCppClass
+class UncompiledDataWithPreparseData extends UncompiledData {
   preparse_data: PreparseData;
 }
 

src/roots/roots.h

@@ -109,10 +109,6 @@ class Symbol;
   V(Map, small_ordered_name_dictionary_map, SmallOrderedNameDictionaryMap)     \
   V(Map, source_text_module_map, SourceTextModuleMap)                          \
   V(Map, synthetic_module_map, SyntheticModuleMap)                             \
-  V(Map, uncompiled_data_without_preparse_data_map,                            \
-    UncompiledDataWithoutPreparseDataMap)                                      \
-  V(Map, uncompiled_data_with_preparse_data_map,                               \
-    UncompiledDataWithPreparseDataMap)                                         \
   V(Map, wasm_type_info_map, WasmTypeInfoMap)                                  \
   V(Map, weak_fixed_array_map, WeakFixedArrayMap)                              \
   V(Map, weak_array_list_map, WeakArrayListMap)                                \

src/torque/implementation-visitor.cc

@@ -4425,8 +4425,8 @@ base::Optional<std::string> MatchSimpleBodyDescriptor(const ClassType* type) {
                     "BodyDescriptor<", start_offset, ">");
   }
   if (!has_weak_pointers) {
-    return ToString("FixedRangeDescriptor<", start_offset, ", ", end_offset,
-                    ", ", *type->size().SingleValue(), ">");
+    return ToString("FixedRangeBodyDescriptor<", start_offset, ", ", end_offset,
+                    ">");
   }
   return base::nullopt;
 }

tools/v8heapconst.py

@@ -272,71 +272,71 @@ KNOWN_MAPS = {
   ("read_only_space", 0x02d81): (151, "SmallOrderedNameDictionaryMap"),
   ("read_only_space", 0x02da9): (154, "SourceTextModuleMap"),
   ("read_only_space", 0x02dd1): (155, "SyntheticModuleMap"),
-  ("read_only_space", 0x02df9): (157, "UncompiledDataWithoutPreparseDataMap"),
-  ("read_only_space", 0x02e21): (156, "UncompiledDataWithPreparseDataMap"),
-  ("read_only_space", 0x02e49): (71, "WasmTypeInfoMap"),
-  ("read_only_space", 0x02e71): (183, "WeakArrayListMap"),
-  ("read_only_space", 0x02e99): (119, "EphemeronHashTableMap"),
-  ("read_only_space", 0x02ec1): (164, "EmbedderDataArrayMap"),
-  ("read_only_space", 0x02ee9): (184, "WeakCellMap"),
-  ("read_only_space", 0x02f11): (32, "StringMap"),
-  ("read_only_space", 0x02f39): (41, "ConsOneByteStringMap"),
-  ("read_only_space", 0x02f61): (33, "ConsStringMap"),
-  ("read_only_space", 0x02f89): (37, "ThinStringMap"),
-  ("read_only_space", 0x02fb1): (35, "SlicedStringMap"),
-  ("read_only_space", 0x02fd9): (43, "SlicedOneByteStringMap"),
-  ("read_only_space", 0x03001): (34, "ExternalStringMap"),
-  ("read_only_space", 0x03029): (42, "ExternalOneByteStringMap"),
-  ("read_only_space", 0x03051): (50, "UncachedExternalStringMap"),
-  ("read_only_space", 0x03079): (0, "InternalizedStringMap"),
-  ("read_only_space", 0x030a1): (2, "ExternalInternalizedStringMap"),
-  ("read_only_space", 0x030c9): (10, "ExternalOneByteInternalizedStringMap"),
-  ("read_only_space", 0x030f1): (18, "UncachedExternalInternalizedStringMap"),
-  ("read_only_space", 0x03119): (26, "UncachedExternalOneByteInternalizedStringMap"),
-  ("read_only_space", 0x03141): (58, "UncachedExternalOneByteStringMap"),
-  ("read_only_space", 0x03169): (67, "SelfReferenceMarkerMap"),
-  ("read_only_space", 0x03191): (67, "BasicBlockCountersMarkerMap"),
-  ("read_only_space", 0x031d5): (87, "ArrayBoilerplateDescriptionMap"),
-  ("read_only_space", 0x032bd): (99, "InterceptorInfoMap"),
-  ("read_only_space", 0x053c9): (72, "PromiseFulfillReactionJobTaskMap"),
-  ("read_only_space", 0x053f1): (73, "PromiseRejectReactionJobTaskMap"),
-  ("read_only_space", 0x05419): (74, "CallableTaskMap"),
-  ("read_only_space", 0x05441): (75, "CallbackTaskMap"),
-  ("read_only_space", 0x05469): (76, "PromiseResolveThenableJobTaskMap"),
-  ("read_only_space", 0x05491): (79, "FunctionTemplateInfoMap"),
-  ("read_only_space", 0x054b9): (80, "ObjectTemplateInfoMap"),
-  ("read_only_space", 0x054e1): (81, "AccessCheckInfoMap"),
-  ("read_only_space", 0x05509): (82, "AccessorInfoMap"),
-  ("read_only_space", 0x05531): (83, "AccessorPairMap"),
-  ("read_only_space", 0x05559): (84, "AliasedArgumentsEntryMap"),
-  ("read_only_space", 0x05581): (85, "AllocationMementoMap"),
-  ("read_only_space", 0x055a9): (88, "AsmWasmDataMap"),
-  ("read_only_space", 0x055d1): (89, "AsyncGeneratorRequestMap"),
-  ("read_only_space", 0x055f9): (90, "BreakPointMap"),
-  ("read_only_space", 0x05621): (91, "BreakPointInfoMap"),
-  ("read_only_space", 0x05649): (92, "CachedTemplateObjectMap"),
-  ("read_only_space", 0x05671): (94, "ClassPositionsMap"),
-  ("read_only_space", 0x05699): (95, "DebugInfoMap"),
-  ("read_only_space", 0x056c1): (98, "FunctionTemplateRareDataMap"),
-  ("read_only_space", 0x056e9): (100, "InterpreterDataMap"),
-  ("read_only_space", 0x05711): (101, "ModuleRequestMap"),
-  ("read_only_space", 0x05739): (102, "PromiseCapabilityMap"),
-  ("read_only_space", 0x05761): (103, "PromiseReactionMap"),
-  ("read_only_space", 0x05789): (104, "PropertyDescriptorObjectMap"),
-  ("read_only_space", 0x057b1): (105, "PrototypeInfoMap"),
-  ("read_only_space", 0x057d9): (106, "ScriptMap"),
-  ("read_only_space", 0x05801): (107, "SourceTextModuleInfoEntryMap"),
-  ("read_only_space", 0x05829): (108, "StackFrameInfoMap"),
-  ("read_only_space", 0x05851): (109, "StackTraceFrameMap"),
-  ("read_only_space", 0x05879): (110, "TemplateObjectDescriptionMap"),
-  ("read_only_space", 0x058a1): (111, "Tuple2Map"),
-  ("read_only_space", 0x058c9): (112, "WasmExceptionTagMap"),
-  ("read_only_space", 0x058f1): (113, "WasmExportedFunctionDataMap"),
-  ("read_only_space", 0x05919): (114, "WasmIndirectFunctionTableMap"),
-  ("read_only_space", 0x05941): (115, "WasmJSFunctionDataMap"),
-  ("read_only_space", 0x05969): (116, "WasmValueMap"),
-  ("read_only_space", 0x05991): (135, "SloppyArgumentsElementsMap"),
-  ("read_only_space", 0x059b9): (152, "DescriptorArrayMap"),
+  ("read_only_space", 0x02df9): (71, "WasmTypeInfoMap"),
+  ("read_only_space", 0x02e21): (183, "WeakArrayListMap"),
+  ("read_only_space", 0x02e49): (119, "EphemeronHashTableMap"),
+  ("read_only_space", 0x02e71): (164, "EmbedderDataArrayMap"),
+  ("read_only_space", 0x02e99): (184, "WeakCellMap"),
+  ("read_only_space", 0x02ec1): (32, "StringMap"),
+  ("read_only_space", 0x02ee9): (41, "ConsOneByteStringMap"),
+  ("read_only_space", 0x02f11): (33, "ConsStringMap"),
+  ("read_only_space", 0x02f39): (37, "ThinStringMap"),
+  ("read_only_space", 0x02f61): (35, "SlicedStringMap"),
+  ("read_only_space", 0x02f89): (43, "SlicedOneByteStringMap"),
+  ("read_only_space", 0x02fb1): (34, "ExternalStringMap"),
+  ("read_only_space", 0x02fd9): (42, "ExternalOneByteStringMap"),
+  ("read_only_space", 0x03001): (50, "UncachedExternalStringMap"),
+  ("read_only_space", 0x03029): (0, "InternalizedStringMap"),
+  ("read_only_space", 0x03051): (2, "ExternalInternalizedStringMap"),
+  ("read_only_space", 0x03079): (10, "ExternalOneByteInternalizedStringMap"),
+  ("read_only_space", 0x030a1): (18, "UncachedExternalInternalizedStringMap"),
+  ("read_only_space", 0x030c9): (26, "UncachedExternalOneByteInternalizedStringMap"),
+  ("read_only_space", 0x030f1): (58, "UncachedExternalOneByteStringMap"),
+  ("read_only_space", 0x03119): (67, "SelfReferenceMarkerMap"),
+  ("read_only_space", 0x03141): (67, "BasicBlockCountersMarkerMap"),
+  ("read_only_space", 0x03185): (87, "ArrayBoilerplateDescriptionMap"),
+  ("read_only_space", 0x0326d): (99, "InterceptorInfoMap"),
+  ("read_only_space", 0x05379): (72, "PromiseFulfillReactionJobTaskMap"),
+  ("read_only_space", 0x053a1): (73, "PromiseRejectReactionJobTaskMap"),
+  ("read_only_space", 0x053c9): (74, "CallableTaskMap"),
+  ("read_only_space", 0x053f1): (75, "CallbackTaskMap"),
+  ("read_only_space", 0x05419): (76, "PromiseResolveThenableJobTaskMap"),
+  ("read_only_space", 0x05441): (79, "FunctionTemplateInfoMap"),
+  ("read_only_space", 0x05469): (80, "ObjectTemplateInfoMap"),
+  ("read_only_space", 0x05491): (81, "AccessCheckInfoMap"),
+  ("read_only_space", 0x054b9): (82, "AccessorInfoMap"),
+  ("read_only_space", 0x054e1): (83, "AccessorPairMap"),
+  ("read_only_space", 0x05509): (84, "AliasedArgumentsEntryMap"),
+  ("read_only_space", 0x05531): (85, "AllocationMementoMap"),
+  ("read_only_space", 0x05559): (88, "AsmWasmDataMap"),
+  ("read_only_space", 0x05581): (89, "AsyncGeneratorRequestMap"),
+  ("read_only_space", 0x055a9): (90, "BreakPointMap"),
+  ("read_only_space", 0x055d1): (91, "BreakPointInfoMap"),
+  ("read_only_space", 0x055f9): (92, "CachedTemplateObjectMap"),
+  ("read_only_space", 0x05621): (94, "ClassPositionsMap"),
+  ("read_only_space", 0x05649): (95, "DebugInfoMap"),
+  ("read_only_space", 0x05671): (98, "FunctionTemplateRareDataMap"),
+  ("read_only_space", 0x05699): (100, "InterpreterDataMap"),
+  ("read_only_space", 0x056c1): (101, "ModuleRequestMap"),
+  ("read_only_space", 0x056e9): (102, "PromiseCapabilityMap"),
+  ("read_only_space", 0x05711): (103, "PromiseReactionMap"),
+  ("read_only_space", 0x05739): (104, "PropertyDescriptorObjectMap"),
+  ("read_only_space", 0x05761): (105, "PrototypeInfoMap"),
+  ("read_only_space", 0x05789): (106, "ScriptMap"),
+  ("read_only_space", 0x057b1): (107, "SourceTextModuleInfoEntryMap"),
+  ("read_only_space", 0x057d9): (108, "StackFrameInfoMap"),
+  ("read_only_space", 0x05801): (109, "StackTraceFrameMap"),
+  ("read_only_space", 0x05829): (110, "TemplateObjectDescriptionMap"),
+  ("read_only_space", 0x05851): (111, "Tuple2Map"),
+  ("read_only_space", 0x05879): (112, "WasmExceptionTagMap"),
+  ("read_only_space", 0x058a1): (113, "WasmExportedFunctionDataMap"),
+  ("read_only_space", 0x058c9): (114, "WasmIndirectFunctionTableMap"),
+  ("read_only_space", 0x058f1): (115, "WasmJSFunctionDataMap"),
+  ("read_only_space", 0x05919): (116, "WasmValueMap"),
+  ("read_only_space", 0x05941): (135, "SloppyArgumentsElementsMap"),
+  ("read_only_space", 0x05969): (152, "DescriptorArrayMap"),
+  ("read_only_space", 0x05991): (157, "UncompiledDataWithoutPreparseDataMap"),
+  ("read_only_space", 0x059b9): (156, "UncompiledDataWithPreparseDataMap"),
   ("read_only_space", 0x059e1): (172, "OnHeapBasicBlockProfilerDataMap"),
   ("read_only_space", 0x05a09): (181, "WasmCapiFunctionDataMap"),
   ("read_only_space", 0x05a31): (169, "InternalClassMap"),
@@ -388,32 +388,32 @@ KNOWN_OBJECTS = {
   ("read_only_space", 0x02821): "TerminationException",
   ("read_only_space", 0x02889): "OptimizedOut",
   ("read_only_space", 0x028e9): "StaleRegister",
-  ("read_only_space", 0x031b9): "EmptyPropertyArray",
-  ("read_only_space", 0x031c1): "EmptyByteArray",
-  ("read_only_space", 0x031c9): "EmptyObjectBoilerplateDescription",
-  ("read_only_space", 0x031fd): "EmptyArrayBoilerplateDescription",
-  ("read_only_space", 0x03209): "EmptyClosureFeedbackCellArray",
-  ("read_only_space", 0x03211): "EmptySlowElementDictionary",
-  ("read_only_space", 0x03235): "EmptyOrderedHashMap",
-  ("read_only_space", 0x03249): "EmptyOrderedHashSet",
-  ("read_only_space", 0x0325d): "EmptyFeedbackMetadata",
-  ("read_only_space", 0x03269): "EmptyPropertyCell",
-  ("read_only_space", 0x0327d): "EmptyPropertyDictionary",
-  ("read_only_space", 0x032a5): "EmptyOrderedPropertyDictionary",
-  ("read_only_space", 0x032e5): "NoOpInterceptorInfo",
-  ("read_only_space", 0x0330d): "EmptyWeakArrayList",
-  ("read_only_space", 0x03319): "InfinityValue",
-  ("read_only_space", 0x03325): "MinusZeroValue",
-  ("read_only_space", 0x03331): "MinusInfinityValue",
-  ("read_only_space", 0x0333d): "SelfReferenceMarker",
-  ("read_only_space", 0x0337d): "BasicBlockCountersMarker",
-  ("read_only_space", 0x033c1): "OffHeapTrampolineRelocationInfo",
-  ("read_only_space", 0x033cd): "TrampolineTrivialCodeDataContainer",
-  ("read_only_space", 0x033d9): "TrampolinePromiseRejectionCodeDataContainer",
-  ("read_only_space", 0x033e5): "GlobalThisBindingScopeInfo",
-  ("read_only_space", 0x0341d): "EmptyFunctionScopeInfo",
-  ("read_only_space", 0x03445): "NativeScopeInfo",
-  ("read_only_space", 0x03461): "HashSeed",
+  ("read_only_space", 0x03169): "EmptyPropertyArray",
+  ("read_only_space", 0x03171): "EmptyByteArray",
+  ("read_only_space", 0x03179): "EmptyObjectBoilerplateDescription",
+  ("read_only_space", 0x031ad): "EmptyArrayBoilerplateDescription",
+  ("read_only_space", 0x031b9): "EmptyClosureFeedbackCellArray",
+  ("read_only_space", 0x031c1): "EmptySlowElementDictionary",
+  ("read_only_space", 0x031e5): "EmptyOrderedHashMap",
+  ("read_only_space", 0x031f9): "EmptyOrderedHashSet",
+  ("read_only_space", 0x0320d): "EmptyFeedbackMetadata",
+  ("read_only_space", 0x03219): "EmptyPropertyCell",
+  ("read_only_space", 0x0322d): "EmptyPropertyDictionary",
+  ("read_only_space", 0x03255): "EmptyOrderedPropertyDictionary",
+  ("read_only_space", 0x03295): "NoOpInterceptorInfo",
+  ("read_only_space", 0x032bd): "EmptyWeakArrayList",
+  ("read_only_space", 0x032c9): "InfinityValue",
+  ("read_only_space", 0x032d5): "MinusZeroValue",
+  ("read_only_space", 0x032e1): "MinusInfinityValue",
+  ("read_only_space", 0x032ed): "SelfReferenceMarker",
+  ("read_only_space", 0x0332d): "BasicBlockCountersMarker",
+  ("read_only_space", 0x03371): "OffHeapTrampolineRelocationInfo",
+  ("read_only_space", 0x0337d): "TrampolineTrivialCodeDataContainer",
+  ("read_only_space", 0x03389): "TrampolinePromiseRejectionCodeDataContainer",
+  ("read_only_space", 0x03395): "GlobalThisBindingScopeInfo",
+  ("read_only_space", 0x033cd): "EmptyFunctionScopeInfo",
+  ("read_only_space", 0x033f5): "NativeScopeInfo",
+  ("read_only_space", 0x03411): "HashSeed",
   ("old_space", 0x02115): "ArgumentsIteratorAccessor",
   ("old_space", 0x02159): "ArrayLengthAccessor",
   ("old_space", 0x0219d): "BoundFunctionLengthAccessor",