Derive SourcePositionTableWithFrameCache directly from Struct

Bug: v8:9158
Change-Id: I40a419a65485a5f407710cbe0cc44275c3fc9739
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1575037Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Commit-Queue: Irina Yatsenko <irinayat@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#61022}

src/builtins/base.tq

@@ -159,6 +159,12 @@ extern class EnumCache extends Struct {
   indices: FixedArray;
 }
 
+@generatePrint
+extern class SourcePositionTableWithFrameCache extends Struct {
+  source_position_table: ByteArray;
+  stack_frame_cache: Object;
+}
+
 // These intrinsics should never be called from Torque code. They're used
 // internally by the 'new' operator and only declared here because it's simpler
 // than building the definition from C++.

src/compiler/types.cc

@@ -351,6 +351,7 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) {
     case TUPLE2_TYPE:
     case TUPLE3_TYPE:
     case ENUM_CACHE_TYPE:
+    case SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE:
     case WASM_DEBUG_INFO_TYPE:
     case WASM_EXCEPTION_TAG_TYPE:
     case WASM_EXPORTED_FUNCTION_DATA_TYPE:

src/heap/factory.cc

@@ -3962,7 +3962,8 @@ Factory::NewSourcePositionTableWithFrameCache(
   Handle<SourcePositionTableWithFrameCache>
       source_position_table_with_frame_cache =
           Handle<SourcePositionTableWithFrameCache>::cast(
-              NewStruct(TUPLE2_TYPE, AllocationType::kOld));
+              NewStruct(SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE,
+                        AllocationType::kOld));
   source_position_table_with_frame_cache->set_source_position_table(
       *source_position_table);
   source_position_table_with_frame_cache->set_stack_frame_cache(

src/objects-debug.cc

@@ -1858,6 +1858,13 @@ void EnumCache::EnumCacheVerify(Isolate* isolate) {
   }
 }
 
+void SourcePositionTableWithFrameCache::SourcePositionTableWithFrameCacheVerify(
+  Isolate* isolate) {
+  VerifyObjectField(isolate, kSourcePositionTableOffset);
+  VerifyObjectField(isolate, kStackFrameCacheOffset);
+  CHECK(source_position_table()->IsByteArray());
+}
+
 void Tuple3::Tuple3Verify(Isolate* isolate) {
   CHECK(IsTuple3());
   VerifyObjectField(isolate, kValue1Offset);

src/objects-definitions.h

@@ -108,6 +108,7 @@ namespace internal {
   V(PROMISE_REACTION_TYPE)                               \
   V(PROTOTYPE_INFO_TYPE)                                 \
   V(SCRIPT_TYPE)                                         \
+  V(SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE)         \
   V(STACK_FRAME_INFO_TYPE)                               \
   V(STACK_TRACE_FRAME_TYPE)                              \
   V(TUPLE2_TYPE)                                         \
@@ -323,6 +324,8 @@ namespace internal {
   V(_, PROMISE_REACTION_TYPE, PromiseReaction, promise_reaction)              \
   V(_, PROTOTYPE_INFO_TYPE, PrototypeInfo, prototype_info)                    \
   V(_, SCRIPT_TYPE, Script, script)                                           \
+  V(_, SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE,                           \
+    SourcePositionTableWithFrameCache, source_position_table_with_frame_cache)\
   V(_, STACK_FRAME_INFO_TYPE, StackFrameInfo, stack_frame_info)               \
   V(_, STACK_TRACE_FRAME_TYPE, StackTraceFrame, stack_trace_frame)            \
   V(_, TUPLE2_TYPE, Tuple2, tuple2)                                           \

src/objects.h

@@ -467,7 +467,6 @@ class ZoneForwardList;
   V(SmallOrderedHashMap)                       \
   V(SmallOrderedHashSet)                       \
   V(SmallOrderedNameDictionary)                \
-  V(SourcePositionTableWithFrameCache)         \
   V(StoreHandler)                              \
   V(String)                                    \
   V(StringSet)                                 \

src/objects/code-inl.h

@@ -29,7 +29,7 @@ OBJECT_CONSTRUCTORS_IMPL(BytecodeArray, FixedArrayBase)
 OBJECT_CONSTRUCTORS_IMPL(AbstractCode, HeapObject)
 OBJECT_CONSTRUCTORS_IMPL(DependentCode, WeakFixedArray)
 OBJECT_CONSTRUCTORS_IMPL(CodeDataContainer, HeapObject)
-OBJECT_CONSTRUCTORS_IMPL(SourcePositionTableWithFrameCache, Tuple2)
+OBJECT_CONSTRUCTORS_IMPL(SourcePositionTableWithFrameCache, Struct)
 
 NEVER_READ_ONLY_SPACE_IMPL(AbstractCode)
 
@@ -42,9 +42,9 @@ CAST_ACCESSOR(DeoptimizationData)
 CAST_ACCESSOR(SourcePositionTableWithFrameCache)
 
 ACCESSORS(SourcePositionTableWithFrameCache, source_position_table, ByteArray,
-          kSourcePositionTableIndex)
+          kSourcePositionTableOffset)
 ACCESSORS(SourcePositionTableWithFrameCache, stack_frame_cache,
-          SimpleNumberDictionary, kStackFrameCacheIndex)
+          SimpleNumberDictionary, kStackFrameCacheOffset)
 
 int AbstractCode::raw_instruction_size() {
   if (IsCode()) {

src/objects/code.h

@@ -948,25 +948,22 @@ class DeoptimizationData : public FixedArray {
   OBJECT_CONSTRUCTORS(DeoptimizationData, FixedArray);
 };
 
-class SourcePositionTableWithFrameCache : public Tuple2 {
+class SourcePositionTableWithFrameCache : public Struct {
  public:
   DECL_ACCESSORS(source_position_table, ByteArray)
   DECL_ACCESSORS(stack_frame_cache, SimpleNumberDictionary)
 
   DECL_CAST(SourcePositionTableWithFrameCache)
 
-// Layout description.
-#define SOURCE_POSITION_TABLE_WITH_FRAME_FIELDS(V) \
-  V(kSourcePositionTableIndex, kTaggedSize)        \
-  V(kStackFrameCacheIndex, kTaggedSize)            \
-  /* Total size. */                                \
-  V(kSize, 0)
+  DECL_PRINTER(SourcePositionTableWithFrameCache)
+  DECL_VERIFIER(SourcePositionTableWithFrameCache)
 
-  DEFINE_FIELD_OFFSET_CONSTANTS(Struct::kHeaderSize,
-                                SOURCE_POSITION_TABLE_WITH_FRAME_FIELDS)
-#undef SOURCE_POSITION_TABLE_WITH_FRAME_FIELDS
+  // Layout description.
+  DEFINE_FIELD_OFFSET_CONSTANTS(
+    Struct::kHeaderSize,
+    TORQUE_GENERATED_SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_FIELDS)
 
-  OBJECT_CONSTRUCTORS(SourcePositionTableWithFrameCache, Tuple2);
+  OBJECT_CONSTRUCTORS(SourcePositionTableWithFrameCache, Struct);
 };
 
 }  // namespace internal

src/objects/instance-type.h

@@ -168,6 +168,7 @@ enum InstanceType : uint16_t {
   PROMISE_REACTION_TYPE,
   PROTOTYPE_INFO_TYPE,
   SCRIPT_TYPE,
+  SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE,
   STACK_FRAME_INFO_TYPE,
   STACK_TRACE_FRAME_TYPE,
   TUPLE2_TYPE,
@@ -471,7 +472,6 @@ V8_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& os,
   V(SmallOrderedHashMap, SMALL_ORDERED_HASH_MAP_TYPE)                        \
   V(SmallOrderedHashSet, SMALL_ORDERED_HASH_SET_TYPE)                        \
   V(SmallOrderedNameDictionary, SMALL_ORDERED_NAME_DICTIONARY_TYPE)          \
-  V(SourcePositionTableWithFrameCache, TUPLE2_TYPE)                          \
   V(StoreHandler, STORE_HANDLER_TYPE)                                        \
   V(StringTable, STRING_TABLE_TYPE)                                          \
   V(Symbol, SYMBOL_TYPE)                                                     \

tools/v8heapconst.py

@@ -71,68 +71,69 @@ INSTANCE_TYPES = {
   107: "PROMISE_REACTION_TYPE",
   108: "PROTOTYPE_INFO_TYPE",
   109: "SCRIPT_TYPE",
-  110: "STACK_FRAME_INFO_TYPE",
-  111: "STACK_TRACE_FRAME_TYPE",
-  112: "TUPLE2_TYPE",
-  113: "TUPLE3_TYPE",
-  114: "ARRAY_BOILERPLATE_DESCRIPTION_TYPE",
-  115: "WASM_DEBUG_INFO_TYPE",
-  116: "WASM_EXCEPTION_TAG_TYPE",
-  117: "WASM_EXPORTED_FUNCTION_DATA_TYPE",
-  118: "CALLABLE_TASK_TYPE",
-  119: "CALLBACK_TASK_TYPE",
-  120: "PROMISE_FULFILL_REACTION_JOB_TASK_TYPE",
-  121: "PROMISE_REJECT_REACTION_JOB_TASK_TYPE",
-  122: "PROMISE_RESOLVE_THENABLE_JOB_TASK_TYPE",
-  123: "FINALIZATION_GROUP_CLEANUP_JOB_TASK_TYPE",
-  124: "ALLOCATION_SITE_TYPE",
-  125: "EMBEDDER_DATA_ARRAY_TYPE",
-  126: "FIXED_ARRAY_TYPE",
-  127: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
-  128: "CLOSURE_FEEDBACK_CELL_ARRAY_TYPE",
-  129: "HASH_TABLE_TYPE",
-  130: "ORDERED_HASH_MAP_TYPE",
-  131: "ORDERED_HASH_SET_TYPE",
-  132: "ORDERED_NAME_DICTIONARY_TYPE",
-  133: "NAME_DICTIONARY_TYPE",
-  134: "GLOBAL_DICTIONARY_TYPE",
-  135: "NUMBER_DICTIONARY_TYPE",
-  136: "SIMPLE_NUMBER_DICTIONARY_TYPE",
-  137: "STRING_TABLE_TYPE",
-  138: "EPHEMERON_HASH_TABLE_TYPE",
-  139: "SCOPE_INFO_TYPE",
-  140: "SCRIPT_CONTEXT_TABLE_TYPE",
-  141: "AWAIT_CONTEXT_TYPE",
-  142: "BLOCK_CONTEXT_TYPE",
-  143: "CATCH_CONTEXT_TYPE",
-  144: "DEBUG_EVALUATE_CONTEXT_TYPE",
-  145: "EVAL_CONTEXT_TYPE",
-  146: "FUNCTION_CONTEXT_TYPE",
-  147: "MODULE_CONTEXT_TYPE",
-  148: "NATIVE_CONTEXT_TYPE",
-  149: "SCRIPT_CONTEXT_TYPE",
-  150: "WITH_CONTEXT_TYPE",
-  151: "WEAK_FIXED_ARRAY_TYPE",
-  152: "TRANSITION_ARRAY_TYPE",
-  153: "CALL_HANDLER_INFO_TYPE",
-  154: "CELL_TYPE",
-  155: "CODE_DATA_CONTAINER_TYPE",
-  156: "DESCRIPTOR_ARRAY_TYPE",
-  157: "FEEDBACK_CELL_TYPE",
-  158: "FEEDBACK_VECTOR_TYPE",
-  159: "LOAD_HANDLER_TYPE",
-  160: "PREPARSE_DATA_TYPE",
-  161: "PROPERTY_ARRAY_TYPE",
-  162: "PROPERTY_CELL_TYPE",
-  163: "SHARED_FUNCTION_INFO_TYPE",
-  164: "SMALL_ORDERED_HASH_MAP_TYPE",
-  165: "SMALL_ORDERED_HASH_SET_TYPE",
-  166: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
-  167: "STORE_HANDLER_TYPE",
-  168: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
-  169: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
-  170: "WEAK_ARRAY_LIST_TYPE",
-  171: "WEAK_CELL_TYPE",
+  110: "SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE",
+  111: "STACK_FRAME_INFO_TYPE",
+  112: "STACK_TRACE_FRAME_TYPE",
+  113: "TUPLE2_TYPE",
+  114: "TUPLE3_TYPE",
+  115: "ARRAY_BOILERPLATE_DESCRIPTION_TYPE",
+  116: "WASM_DEBUG_INFO_TYPE",
+  117: "WASM_EXCEPTION_TAG_TYPE",
+  118: "WASM_EXPORTED_FUNCTION_DATA_TYPE",
+  119: "CALLABLE_TASK_TYPE",
+  120: "CALLBACK_TASK_TYPE",
+  121: "PROMISE_FULFILL_REACTION_JOB_TASK_TYPE",
+  122: "PROMISE_REJECT_REACTION_JOB_TASK_TYPE",
+  123: "PROMISE_RESOLVE_THENABLE_JOB_TASK_TYPE",
+  124: "FINALIZATION_GROUP_CLEANUP_JOB_TASK_TYPE",
+  125: "ALLOCATION_SITE_TYPE",
+  126: "EMBEDDER_DATA_ARRAY_TYPE",
+  127: "FIXED_ARRAY_TYPE",
+  128: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
+  129: "CLOSURE_FEEDBACK_CELL_ARRAY_TYPE",
+  130: "HASH_TABLE_TYPE",
+  131: "ORDERED_HASH_MAP_TYPE",
+  132: "ORDERED_HASH_SET_TYPE",
+  133: "ORDERED_NAME_DICTIONARY_TYPE",
+  134: "NAME_DICTIONARY_TYPE",
+  135: "GLOBAL_DICTIONARY_TYPE",
+  136: "NUMBER_DICTIONARY_TYPE",
+  137: "SIMPLE_NUMBER_DICTIONARY_TYPE",
+  138: "STRING_TABLE_TYPE",
+  139: "EPHEMERON_HASH_TABLE_TYPE",
+  140: "SCOPE_INFO_TYPE",
+  141: "SCRIPT_CONTEXT_TABLE_TYPE",
+  142: "AWAIT_CONTEXT_TYPE",
+  143: "BLOCK_CONTEXT_TYPE",
+  144: "CATCH_CONTEXT_TYPE",
+  145: "DEBUG_EVALUATE_CONTEXT_TYPE",
+  146: "EVAL_CONTEXT_TYPE",
+  147: "FUNCTION_CONTEXT_TYPE",
+  148: "MODULE_CONTEXT_TYPE",
+  149: "NATIVE_CONTEXT_TYPE",
+  150: "SCRIPT_CONTEXT_TYPE",
+  151: "WITH_CONTEXT_TYPE",
+  152: "WEAK_FIXED_ARRAY_TYPE",
+  153: "TRANSITION_ARRAY_TYPE",
+  154: "CALL_HANDLER_INFO_TYPE",
+  155: "CELL_TYPE",
+  156: "CODE_DATA_CONTAINER_TYPE",
+  157: "DESCRIPTOR_ARRAY_TYPE",
+  158: "FEEDBACK_CELL_TYPE",
+  159: "FEEDBACK_VECTOR_TYPE",
+  160: "LOAD_HANDLER_TYPE",
+  161: "PREPARSE_DATA_TYPE",
+  162: "PROPERTY_ARRAY_TYPE",
+  163: "PROPERTY_CELL_TYPE",
+  164: "SHARED_FUNCTION_INFO_TYPE",
+  165: "SMALL_ORDERED_HASH_MAP_TYPE",
+  166: "SMALL_ORDERED_HASH_SET_TYPE",
+  167: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
+  168: "STORE_HANDLER_TYPE",
+  169: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
+  170: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
+  171: "WEAK_ARRAY_LIST_TYPE",
+  172: "WEAK_CELL_TYPE",
   1024: "JS_PROXY_TYPE",
   1025: "JS_GLOBAL_OBJECT_TYPE",
   1026: "JS_GLOBAL_PROXY_TYPE",
@@ -196,8 +197,8 @@ KNOWN_MAPS = {
   ("read_only_space", 0x00139): (74, "FreeSpaceMap"),
   ("read_only_space", 0x00189): (68, "MetaMap"),
   ("read_only_space", 0x00209): (67, "NullMap"),
-  ("read_only_space", 0x00271): (156, "DescriptorArrayMap"),
-  ("read_only_space", 0x002d1): (151, "WeakFixedArrayMap"),
+  ("read_only_space", 0x00271): (157, "DescriptorArrayMap"),
+  ("read_only_space", 0x002d1): (152, "WeakFixedArrayMap"),
   ("read_only_space", 0x00321): (88, "OnePointerFillerMap"),
   ("read_only_space", 0x00371): (88, "TwoPointerFillerMap"),
   ("read_only_space", 0x003f1): (67, "UninitializedMap"),
@@ -207,71 +208,71 @@ KNOWN_MAPS = {
   ("read_only_space", 0x005e1): (67, "TheHoleMap"),
   ("read_only_space", 0x00689): (67, "BooleanMap"),
   ("read_only_space", 0x00761): (72, "ByteArrayMap"),
-  ("read_only_space", 0x007b1): (126, "FixedArrayMap"),
-  ("read_only_space", 0x00801): (126, "FixedCOWArrayMap"),
-  ("read_only_space", 0x00851): (129, "HashTableMap"),
+  ("read_only_space", 0x007b1): (127, "FixedArrayMap"),
+  ("read_only_space", 0x00801): (127, "FixedCOWArrayMap"),
+  ("read_only_space", 0x00851): (130, "HashTableMap"),
   ("read_only_space", 0x008a1): (64, "SymbolMap"),
   ("read_only_space", 0x008f1): (40, "OneByteStringMap"),
-  ("read_only_space", 0x00941): (139, "ScopeInfoMap"),
-  ("read_only_space", 0x00991): (163, "SharedFunctionInfoMap"),
+  ("read_only_space", 0x00941): (140, "ScopeInfoMap"),
+  ("read_only_space", 0x00991): (164, "SharedFunctionInfoMap"),
   ("read_only_space", 0x009e1): (69, "CodeMap"),
-  ("read_only_space", 0x00a31): (146, "FunctionContextMap"),
-  ("read_only_space", 0x00a81): (154, "CellMap"),
-  ("read_only_space", 0x00ad1): (162, "GlobalPropertyCellMap"),
+  ("read_only_space", 0x00a31): (147, "FunctionContextMap"),
+  ("read_only_space", 0x00a81): (155, "CellMap"),
+  ("read_only_space", 0x00ad1): (163, "GlobalPropertyCellMap"),
   ("read_only_space", 0x00b21): (71, "ForeignMap"),
-  ("read_only_space", 0x00b71): (152, "TransitionArrayMap"),
-  ("read_only_space", 0x00bc1): (158, "FeedbackVectorMap"),
+  ("read_only_space", 0x00b71): (153, "TransitionArrayMap"),
+  ("read_only_space", 0x00bc1): (159, "FeedbackVectorMap"),
   ("read_only_space", 0x00c61): (67, "ArgumentsMarkerMap"),
   ("read_only_space", 0x00d01): (67, "ExceptionMap"),
   ("read_only_space", 0x00da1): (67, "TerminationExceptionMap"),
   ("read_only_space", 0x00e49): (67, "OptimizedOutMap"),
   ("read_only_space", 0x00ee9): (67, "StaleRegisterMap"),
-  ("read_only_space", 0x00f59): (148, "NativeContextMap"),
-  ("read_only_space", 0x00fa9): (147, "ModuleContextMap"),
-  ("read_only_space", 0x00ff9): (145, "EvalContextMap"),
-  ("read_only_space", 0x01049): (149, "ScriptContextMap"),
-  ("read_only_space", 0x01099): (141, "AwaitContextMap"),
-  ("read_only_space", 0x010e9): (142, "BlockContextMap"),
-  ("read_only_space", 0x01139): (143, "CatchContextMap"),
-  ("read_only_space", 0x01189): (150, "WithContextMap"),
-  ("read_only_space", 0x011d9): (144, "DebugEvaluateContextMap"),
-  ("read_only_space", 0x01229): (140, "ScriptContextTableMap"),
-  ("read_only_space", 0x01279): (128, "ClosureFeedbackCellArrayMap"),
+  ("read_only_space", 0x00f59): (149, "NativeContextMap"),
+  ("read_only_space", 0x00fa9): (148, "ModuleContextMap"),
+  ("read_only_space", 0x00ff9): (146, "EvalContextMap"),
+  ("read_only_space", 0x01049): (150, "ScriptContextMap"),
+  ("read_only_space", 0x01099): (142, "AwaitContextMap"),
+  ("read_only_space", 0x010e9): (143, "BlockContextMap"),
+  ("read_only_space", 0x01139): (144, "CatchContextMap"),
+  ("read_only_space", 0x01189): (151, "WithContextMap"),
+  ("read_only_space", 0x011d9): (145, "DebugEvaluateContextMap"),
+  ("read_only_space", 0x01229): (141, "ScriptContextTableMap"),
+  ("read_only_space", 0x01279): (129, "ClosureFeedbackCellArrayMap"),
   ("read_only_space", 0x012c9): (87, "FeedbackMetadataArrayMap"),
-  ("read_only_space", 0x01319): (126, "ArrayListMap"),
+  ("read_only_space", 0x01319): (127, "ArrayListMap"),
   ("read_only_space", 0x01369): (66, "BigIntMap"),
-  ("read_only_space", 0x013b9): (127, "ObjectBoilerplateDescriptionMap"),
+  ("read_only_space", 0x013b9): (128, "ObjectBoilerplateDescriptionMap"),
   ("read_only_space", 0x01409): (73, "BytecodeArrayMap"),
-  ("read_only_space", 0x01459): (155, "CodeDataContainerMap"),
+  ("read_only_space", 0x01459): (156, "CodeDataContainerMap"),
   ("read_only_space", 0x014a9): (86, "FixedDoubleArrayMap"),
-  ("read_only_space", 0x014f9): (134, "GlobalDictionaryMap"),
-  ("read_only_space", 0x01549): (157, "ManyClosuresCellMap"),
-  ("read_only_space", 0x01599): (126, "ModuleInfoMap"),
+  ("read_only_space", 0x014f9): (135, "GlobalDictionaryMap"),
+  ("read_only_space", 0x01549): (158, "ManyClosuresCellMap"),
+  ("read_only_space", 0x01599): (127, "ModuleInfoMap"),
   ("read_only_space", 0x015e9): (70, "MutableHeapNumberMap"),
-  ("read_only_space", 0x01639): (133, "NameDictionaryMap"),
-  ("read_only_space", 0x01689): (157, "NoClosuresCellMap"),
-  ("read_only_space", 0x016d9): (135, "NumberDictionaryMap"),
-  ("read_only_space", 0x01729): (157, "OneClosureCellMap"),
-  ("read_only_space", 0x01779): (130, "OrderedHashMapMap"),
-  ("read_only_space", 0x017c9): (131, "OrderedHashSetMap"),
-  ("read_only_space", 0x01819): (132, "OrderedNameDictionaryMap"),
-  ("read_only_space", 0x01869): (160, "PreparseDataMap"),
-  ("read_only_space", 0x018b9): (161, "PropertyArrayMap"),
-  ("read_only_space", 0x01909): (153, "SideEffectCallHandlerInfoMap"),
-  ("read_only_space", 0x01959): (153, "SideEffectFreeCallHandlerInfoMap"),
-  ("read_only_space", 0x019a9): (153, "NextCallSideEffectFreeCallHandlerInfoMap"),
-  ("read_only_space", 0x019f9): (136, "SimpleNumberDictionaryMap"),
-  ("read_only_space", 0x01a49): (126, "SloppyArgumentsElementsMap"),
-  ("read_only_space", 0x01a99): (164, "SmallOrderedHashMapMap"),
-  ("read_only_space", 0x01ae9): (165, "SmallOrderedHashSetMap"),
-  ("read_only_space", 0x01b39): (166, "SmallOrderedNameDictionaryMap"),
-  ("read_only_space", 0x01b89): (137, "StringTableMap"),
-  ("read_only_space", 0x01bd9): (168, "UncompiledDataWithoutPreparseDataMap"),
-  ("read_only_space", 0x01c29): (169, "UncompiledDataWithPreparseDataMap"),
-  ("read_only_space", 0x01c79): (170, "WeakArrayListMap"),
-  ("read_only_space", 0x01cc9): (138, "EphemeronHashTableMap"),
-  ("read_only_space", 0x01d19): (125, "EmbedderDataArrayMap"),
-  ("read_only_space", 0x01d69): (171, "WeakCellMap"),
+  ("read_only_space", 0x01639): (134, "NameDictionaryMap"),
+  ("read_only_space", 0x01689): (158, "NoClosuresCellMap"),
+  ("read_only_space", 0x016d9): (136, "NumberDictionaryMap"),
+  ("read_only_space", 0x01729): (158, "OneClosureCellMap"),
+  ("read_only_space", 0x01779): (131, "OrderedHashMapMap"),
+  ("read_only_space", 0x017c9): (132, "OrderedHashSetMap"),
+  ("read_only_space", 0x01819): (133, "OrderedNameDictionaryMap"),
+  ("read_only_space", 0x01869): (161, "PreparseDataMap"),
+  ("read_only_space", 0x018b9): (162, "PropertyArrayMap"),
+  ("read_only_space", 0x01909): (154, "SideEffectCallHandlerInfoMap"),
+  ("read_only_space", 0x01959): (154, "SideEffectFreeCallHandlerInfoMap"),
+  ("read_only_space", 0x019a9): (154, "NextCallSideEffectFreeCallHandlerInfoMap"),
+  ("read_only_space", 0x019f9): (137, "SimpleNumberDictionaryMap"),
+  ("read_only_space", 0x01a49): (127, "SloppyArgumentsElementsMap"),
+  ("read_only_space", 0x01a99): (165, "SmallOrderedHashMapMap"),
+  ("read_only_space", 0x01ae9): (166, "SmallOrderedHashSetMap"),
+  ("read_only_space", 0x01b39): (167, "SmallOrderedNameDictionaryMap"),
+  ("read_only_space", 0x01b89): (138, "StringTableMap"),
+  ("read_only_space", 0x01bd9): (169, "UncompiledDataWithoutPreparseDataMap"),
+  ("read_only_space", 0x01c29): (170, "UncompiledDataWithPreparseDataMap"),
+  ("read_only_space", 0x01c79): (171, "WeakArrayListMap"),
+  ("read_only_space", 0x01cc9): (139, "EphemeronHashTableMap"),
+  ("read_only_space", 0x01d19): (126, "EmbedderDataArrayMap"),
+  ("read_only_space", 0x01d69): (172, "WeakCellMap"),
   ("read_only_space", 0x01db9): (58, "NativeSourceStringMap"),
   ("read_only_space", 0x01e09): (32, "StringMap"),
   ("read_only_space", 0x01e59): (41, "ConsOneByteStringMap"),
@@ -302,7 +303,7 @@ KNOWN_MAPS = {
   ("read_only_space", 0x02629): (84, "FixedBigInt64ArrayMap"),
   ("read_only_space", 0x02679): (67, "SelfReferenceMarkerMap"),
   ("read_only_space", 0x026e1): (98, "EnumCacheMap"),
-  ("read_only_space", 0x02781): (114, "ArrayBoilerplateDescriptionMap"),
+  ("read_only_space", 0x02781): (115, "ArrayBoilerplateDescriptionMap"),
   ("read_only_space", 0x02ad1): (101, "InterceptorInfoMap"),
   ("read_only_space", 0x05109): (89, "AccessCheckInfoMap"),
   ("read_only_space", 0x05159): (90, "AccessorInfoMap"),
@@ -323,28 +324,29 @@ KNOWN_MAPS = {
   ("read_only_space", 0x05609): (107, "PromiseReactionMap"),
   ("read_only_space", 0x05659): (108, "PrototypeInfoMap"),
   ("read_only_space", 0x056a9): (109, "ScriptMap"),
-  ("read_only_space", 0x056f9): (110, "StackFrameInfoMap"),
-  ("read_only_space", 0x05749): (111, "StackTraceFrameMap"),
-  ("read_only_space", 0x05799): (112, "Tuple2Map"),
-  ("read_only_space", 0x057e9): (113, "Tuple3Map"),
-  ("read_only_space", 0x05839): (115, "WasmDebugInfoMap"),
-  ("read_only_space", 0x05889): (116, "WasmExceptionTagMap"),
-  ("read_only_space", 0x058d9): (117, "WasmExportedFunctionDataMap"),
-  ("read_only_space", 0x05929): (118, "CallableTaskMap"),
-  ("read_only_space", 0x05979): (119, "CallbackTaskMap"),
-  ("read_only_space", 0x059c9): (120, "PromiseFulfillReactionJobTaskMap"),
-  ("read_only_space", 0x05a19): (121, "PromiseRejectReactionJobTaskMap"),
-  ("read_only_space", 0x05a69): (122, "PromiseResolveThenableJobTaskMap"),
-  ("read_only_space", 0x05ab9): (123, "FinalizationGroupCleanupJobTaskMap"),
-  ("read_only_space", 0x05b09): (124, "AllocationSiteWithWeakNextMap"),
-  ("read_only_space", 0x05b59): (124, "AllocationSiteWithoutWeakNextMap"),
-  ("read_only_space", 0x05ba9): (159, "LoadHandler1Map"),
-  ("read_only_space", 0x05bf9): (159, "LoadHandler2Map"),
-  ("read_only_space", 0x05c49): (159, "LoadHandler3Map"),
-  ("read_only_space", 0x05c99): (167, "StoreHandler0Map"),
-  ("read_only_space", 0x05ce9): (167, "StoreHandler1Map"),
-  ("read_only_space", 0x05d39): (167, "StoreHandler2Map"),
-  ("read_only_space", 0x05d89): (167, "StoreHandler3Map"),
+  ("read_only_space", 0x056f9): (110, "SourcePositionTableWithFrameCacheMap"),
+  ("read_only_space", 0x05749): (111, "StackFrameInfoMap"),
+  ("read_only_space", 0x05799): (112, "StackTraceFrameMap"),
+  ("read_only_space", 0x057e9): (113, "Tuple2Map"),
+  ("read_only_space", 0x05839): (114, "Tuple3Map"),
+  ("read_only_space", 0x05889): (116, "WasmDebugInfoMap"),
+  ("read_only_space", 0x058d9): (117, "WasmExceptionTagMap"),
+  ("read_only_space", 0x05929): (118, "WasmExportedFunctionDataMap"),
+  ("read_only_space", 0x05979): (119, "CallableTaskMap"),
+  ("read_only_space", 0x059c9): (120, "CallbackTaskMap"),
+  ("read_only_space", 0x05a19): (121, "PromiseFulfillReactionJobTaskMap"),
+  ("read_only_space", 0x05a69): (122, "PromiseRejectReactionJobTaskMap"),
+  ("read_only_space", 0x05ab9): (123, "PromiseResolveThenableJobTaskMap"),
+  ("read_only_space", 0x05b09): (124, "FinalizationGroupCleanupJobTaskMap"),
+  ("read_only_space", 0x05b59): (125, "AllocationSiteWithWeakNextMap"),
+  ("read_only_space", 0x05ba9): (125, "AllocationSiteWithoutWeakNextMap"),
+  ("read_only_space", 0x05bf9): (160, "LoadHandler1Map"),
+  ("read_only_space", 0x05c49): (160, "LoadHandler2Map"),
+  ("read_only_space", 0x05c99): (160, "LoadHandler3Map"),
+  ("read_only_space", 0x05ce9): (168, "StoreHandler0Map"),
+  ("read_only_space", 0x05d39): (168, "StoreHandler1Map"),
+  ("read_only_space", 0x05d89): (168, "StoreHandler2Map"),
+  ("read_only_space", 0x05dd9): (168, "StoreHandler3Map"),
   ("map_space", 0x00139): (1057, "ExternalMap"),
   ("map_space", 0x00189): (1073, "JSMessageObjectMap"),
 }