[torque] Derive TemplateObjectDescription directly from Struct.

Bug: v8:8952
Change-Id: I36ee0d6793a4a9715360c155636f6e19db2119bc
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1616015
Commit-Queue: Suraj Sharma <surshar@microsoft.com>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Reviewed-by: Simon Zünd <szuend@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61673}

src/builtins/base.tq

@@ -18,6 +18,7 @@
 #include 'src/objects/stack-frame-info.h'
 #include 'src/objects/template-objects.h'
 #include 'src/builtins/builtins-regexp-gen.h'
+#include 'src/objects/template-objects.h'
 
 type void;
 type never;
@@ -729,6 +730,12 @@ extern class TemplateInfo extends Struct {
   property_accessors: Object;
 }
 
+@generatePrint
+extern class TemplateObjectDescription extends Struct {
+  raw_strings: FixedArray;
+  cooked_strings: FixedArray;
+}
+
 extern class FunctionTemplateRareData extends Struct {
   prototype_template: Object;
   prototype_provider_template: Object;

src/compiler/types.cc

@@ -348,6 +348,7 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) {
     case SMALL_ORDERED_NAME_DICTIONARY_TYPE:
     case PROTOTYPE_INFO_TYPE:
     case INTERPRETER_DATA_TYPE:
+    case TEMPLATE_OBJECT_DESCRIPTION_TYPE:
     case TUPLE2_TYPE:
     case TUPLE3_TYPE:
     case ENUM_CACHE_TYPE:

src/diagnostics/objects-debug.cc

@@ -61,6 +61,7 @@
 #include "src/objects/promise-inl.h"
 #include "src/objects/stack-frame-info-inl.h"
 #include "src/objects/struct-inl.h"
+#include "src/objects/template-objects-inl.h"
 #include "src/objects/transitions-inl.h"
 #include "src/ostreams.h"
 #include "src/regexp/jsregexp.h"
@@ -1645,6 +1646,8 @@ void PrototypeUsers::Verify(WeakArrayList array) {
   CHECK_EQ(weak_maps_count + empty_slots_count + 1, array->length());
 }
 
+USE_TORQUE_VERIFIER(TemplateObjectDescription)
+
 void EnumCache::EnumCacheVerify(Isolate* isolate) {
   TorqueGeneratedClassVerifiers::EnumCacheVerify(*this, isolate);
   Heap* heap = isolate->heap();

src/diagnostics/objects-printer.cc

@@ -58,6 +58,7 @@
 #include "src/objects/promise-inl.h"
 #include "src/objects/stack-frame-info-inl.h"
 #include "src/objects/struct-inl.h"
+#include "src/objects/template-objects-inl.h"
 #include "src/objects/transitions-inl.h"
 #include "src/ostreams.h"
 #include "src/regexp/jsregexp.h"

src/heap/factory.cc

@@ -349,7 +349,7 @@ Handle<TemplateObjectDescription> Factory::NewTemplateObjectDescription(
   DCHECK_LT(0, raw_strings->length());
   Handle<TemplateObjectDescription> result =
       Handle<TemplateObjectDescription>::cast(
-          NewStruct(TUPLE2_TYPE, AllocationType::kOld));
+          NewStruct(TEMPLATE_OBJECT_DESCRIPTION_TYPE, AllocationType::kOld));
   result->set_raw_strings(*raw_strings);
   result->set_cooked_strings(*cooked_strings);
   return result;

src/heap/setup-heap-internal.cc

@@ -39,6 +39,7 @@
 #include "src/objects/smi.h"
 #include "src/objects/stack-frame-info.h"
 #include "src/objects/string.h"
+#include "src/objects/template-objects-inl.h"
 #include "src/regexp/jsregexp.h"
 #include "src/wasm/wasm-objects.h"
 

src/objects-definitions.h

@@ -111,6 +111,7 @@ namespace internal {
   V(SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE)         \
   V(STACK_FRAME_INFO_TYPE)                               \
   V(STACK_TRACE_FRAME_TYPE)                              \
+  V(TEMPLATE_OBJECT_DESCRIPTION_TYPE)                    \
   V(TUPLE2_TYPE)                                         \
   V(TUPLE3_TYPE)                                         \
   V(ARRAY_BOILERPLATE_DESCRIPTION_TYPE)                  \
@@ -329,6 +330,8 @@ namespace internal {
     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(_, TEMPLATE_OBJECT_DESCRIPTION_TYPE, TemplateObjectDescription,            \
+    template_object_description)                                               \
   V(_, TUPLE2_TYPE, Tuple2, tuple2)                                            \
   V(_, TUPLE3_TYPE, Tuple3, tuple3)                                            \
   V(_, ARRAY_BOILERPLATE_DESCRIPTION_TYPE, ArrayBoilerplateDescription,        \

src/objects.cc

@@ -100,6 +100,7 @@
 #include "src/objects/stack-frame-info-inl.h"
 #include "src/objects/string-comparator.h"
 #include "src/objects/struct-inl.h"
+#include "src/objects/template-objects-inl.h"
 #include "src/objects/transitions-inl.h"
 #include "src/ostreams.h"
 #include "src/parsing/preparse-data.h"

src/objects/instance-type.h

@@ -171,6 +171,7 @@ enum InstanceType : uint16_t {
   SOURCE_POSITION_TABLE_WITH_FRAME_CACHE_TYPE,
   STACK_FRAME_INFO_TYPE,
   STACK_TRACE_FRAME_TYPE,
+  TEMPLATE_OBJECT_DESCRIPTION_TYPE,
   TUPLE2_TYPE,
   TUPLE3_TYPE,
   ARRAY_BOILERPLATE_DESCRIPTION_TYPE,
@@ -480,7 +481,6 @@ V8_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& os,
   V(StoreHandler, STORE_HANDLER_TYPE)                                        \
   V(StringTable, STRING_TABLE_TYPE)                                          \
   V(Symbol, SYMBOL_TYPE)                                                     \
-  V(TemplateObjectDescription, TUPLE2_TYPE)                                  \
   V(TransitionArray, TRANSITION_ARRAY_TYPE)                                  \
   V(UncompiledDataWithoutPreparseData,                                       \
     UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE)                              \

src/objects/object-list-macros.h

@@ -224,7 +224,6 @@ class ZoneForwardList;
   V(SymbolWrapper)                             \
   V(TemplateInfo)                              \
   V(TemplateList)                              \
-  V(TemplateObjectDescription)                 \
   V(ThinString)                                \
   V(TransitionArray)                           \
   V(UncompiledData)                            \

src/objects/template-objects-inl.h

@@ -15,7 +15,7 @@
 namespace v8 {
 namespace internal {
 
-OBJECT_CONSTRUCTORS_IMPL(TemplateObjectDescription, Tuple2)
+OBJECT_CONSTRUCTORS_IMPL(TemplateObjectDescription, Struct)
 OBJECT_CONSTRUCTORS_IMPL(CachedTemplateObject, Tuple3)
 
 CAST_ACCESSOR(TemplateObjectDescription)

src/objects/template-objects.h

@@ -39,22 +39,25 @@ class CachedTemplateObject final : public Tuple3 {
 // TemplateObjectDescription is a tuple of raw strings and cooked strings for
 // tagged template literals. Used to communicate with the runtime for template
 // object creation within the {Runtime_GetTemplateObject} method.
-class TemplateObjectDescription final : public Tuple2 {
+class TemplateObjectDescription final : public Struct {
  public:
   DECL_ACCESSORS(raw_strings, FixedArray)
   DECL_ACCESSORS(cooked_strings, FixedArray)
 
+  DECL_CAST(TemplateObjectDescription)
+
   static Handle<JSArray> GetTemplateObject(
       Isolate* isolate, Handle<Context> native_context,
       Handle<TemplateObjectDescription> description,
       Handle<SharedFunctionInfo> shared_info, int slot_id);
 
-  DECL_CAST(TemplateObjectDescription)
+  DECL_PRINTER(TemplateObjectDescription)
+  DECL_VERIFIER(TemplateObjectDescription)
 
-  static constexpr int kRawStringsOffset = kValue1Offset;
-  static constexpr int kCookedStringsOffset = kValue2Offset;
+  DEFINE_FIELD_OFFSET_CONSTANTS(
+      Struct::kHeaderSize, TORQUE_GENERATED_TEMPLATE_OBJECT_DESCRIPTION_FIELDS)
 
-  OBJECT_CONSTRUCTORS(TemplateObjectDescription, Tuple2);
+  OBJECT_CONSTRUCTORS(TemplateObjectDescription, Struct);
 };
 
 }  // namespace internal

src/torque/implementation-visitor.cc

@@ -3164,6 +3164,7 @@ void ImplementationVisitor::GeneratePrintDefinitions(
     impl << "#include \"src/objects.h\"\n\n";
     impl << "#include <iosfwd>\n\n";
     impl << "#include \"src/objects/struct-inl.h\"\n\n";
+    impl << "#include \"src/objects/template-objects-inl.h\"\n\n";
 
     NamespaceScope impl_namespaces(impl, {"v8", "internal"});
 

tools/v8heapconst.py

@@ -74,67 +74,68 @@ INSTANCE_TYPES = {
   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_CAPI_FUNCTION_DATA_TYPE",
-  117: "WASM_DEBUG_INFO_TYPE",
-  118: "WASM_EXCEPTION_TAG_TYPE",
-  119: "WASM_EXPORTED_FUNCTION_DATA_TYPE",
-  120: "CALLABLE_TASK_TYPE",
-  121: "CALLBACK_TASK_TYPE",
-  122: "PROMISE_FULFILL_REACTION_JOB_TASK_TYPE",
-  123: "PROMISE_REJECT_REACTION_JOB_TASK_TYPE",
-  124: "PROMISE_RESOLVE_THENABLE_JOB_TASK_TYPE",
-  125: "FINALIZATION_GROUP_CLEANUP_JOB_TASK_TYPE",
-  126: "ALLOCATION_SITE_TYPE",
-  127: "EMBEDDER_DATA_ARRAY_TYPE",
-  128: "FIXED_ARRAY_TYPE",
-  129: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
-  130: "CLOSURE_FEEDBACK_CELL_ARRAY_TYPE",
-  131: "HASH_TABLE_TYPE",
-  132: "ORDERED_HASH_MAP_TYPE",
-  133: "ORDERED_HASH_SET_TYPE",
-  134: "ORDERED_NAME_DICTIONARY_TYPE",
-  135: "NAME_DICTIONARY_TYPE",
-  136: "GLOBAL_DICTIONARY_TYPE",
-  137: "NUMBER_DICTIONARY_TYPE",
-  138: "SIMPLE_NUMBER_DICTIONARY_TYPE",
-  139: "STRING_TABLE_TYPE",
-  140: "EPHEMERON_HASH_TABLE_TYPE",
-  141: "SCOPE_INFO_TYPE",
-  142: "SCRIPT_CONTEXT_TABLE_TYPE",
-  143: "AWAIT_CONTEXT_TYPE",
-  144: "BLOCK_CONTEXT_TYPE",
-  145: "CATCH_CONTEXT_TYPE",
-  146: "DEBUG_EVALUATE_CONTEXT_TYPE",
-  147: "EVAL_CONTEXT_TYPE",
-  148: "FUNCTION_CONTEXT_TYPE",
-  149: "MODULE_CONTEXT_TYPE",
-  150: "NATIVE_CONTEXT_TYPE",
-  151: "SCRIPT_CONTEXT_TYPE",
-  152: "WITH_CONTEXT_TYPE",
-  153: "WEAK_FIXED_ARRAY_TYPE",
-  154: "TRANSITION_ARRAY_TYPE",
-  155: "CALL_HANDLER_INFO_TYPE",
-  156: "CELL_TYPE",
-  157: "CODE_DATA_CONTAINER_TYPE",
-  158: "DESCRIPTOR_ARRAY_TYPE",
-  159: "FEEDBACK_CELL_TYPE",
-  160: "FEEDBACK_VECTOR_TYPE",
-  161: "LOAD_HANDLER_TYPE",
-  162: "PREPARSE_DATA_TYPE",
-  163: "PROPERTY_ARRAY_TYPE",
-  164: "PROPERTY_CELL_TYPE",
-  165: "SHARED_FUNCTION_INFO_TYPE",
-  166: "SMALL_ORDERED_HASH_MAP_TYPE",
-  167: "SMALL_ORDERED_HASH_SET_TYPE",
-  168: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
-  169: "STORE_HANDLER_TYPE",
-  170: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
-  171: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
-  172: "WEAK_ARRAY_LIST_TYPE",
-  173: "WEAK_CELL_TYPE",
+  113: "TEMPLATE_OBJECT_DESCRIPTION_TYPE",
+  114: "TUPLE2_TYPE",
+  115: "TUPLE3_TYPE",
+  116: "ARRAY_BOILERPLATE_DESCRIPTION_TYPE",
+  117: "WASM_CAPI_FUNCTION_DATA_TYPE",
+  118: "WASM_DEBUG_INFO_TYPE",
+  119: "WASM_EXCEPTION_TAG_TYPE",
+  120: "WASM_EXPORTED_FUNCTION_DATA_TYPE",
+  121: "CALLABLE_TASK_TYPE",
+  122: "CALLBACK_TASK_TYPE",
+  123: "PROMISE_FULFILL_REACTION_JOB_TASK_TYPE",
+  124: "PROMISE_REJECT_REACTION_JOB_TASK_TYPE",
+  125: "PROMISE_RESOLVE_THENABLE_JOB_TASK_TYPE",
+  126: "FINALIZATION_GROUP_CLEANUP_JOB_TASK_TYPE",
+  127: "ALLOCATION_SITE_TYPE",
+  128: "EMBEDDER_DATA_ARRAY_TYPE",
+  129: "FIXED_ARRAY_TYPE",
+  130: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
+  131: "CLOSURE_FEEDBACK_CELL_ARRAY_TYPE",
+  132: "HASH_TABLE_TYPE",
+  133: "ORDERED_HASH_MAP_TYPE",
+  134: "ORDERED_HASH_SET_TYPE",
+  135: "ORDERED_NAME_DICTIONARY_TYPE",
+  136: "NAME_DICTIONARY_TYPE",
+  137: "GLOBAL_DICTIONARY_TYPE",
+  138: "NUMBER_DICTIONARY_TYPE",
+  139: "SIMPLE_NUMBER_DICTIONARY_TYPE",
+  140: "STRING_TABLE_TYPE",
+  141: "EPHEMERON_HASH_TABLE_TYPE",
+  142: "SCOPE_INFO_TYPE",
+  143: "SCRIPT_CONTEXT_TABLE_TYPE",
+  144: "AWAIT_CONTEXT_TYPE",
+  145: "BLOCK_CONTEXT_TYPE",
+  146: "CATCH_CONTEXT_TYPE",
+  147: "DEBUG_EVALUATE_CONTEXT_TYPE",
+  148: "EVAL_CONTEXT_TYPE",
+  149: "FUNCTION_CONTEXT_TYPE",
+  150: "MODULE_CONTEXT_TYPE",
+  151: "NATIVE_CONTEXT_TYPE",
+  152: "SCRIPT_CONTEXT_TYPE",
+  153: "WITH_CONTEXT_TYPE",
+  154: "WEAK_FIXED_ARRAY_TYPE",
+  155: "TRANSITION_ARRAY_TYPE",
+  156: "CALL_HANDLER_INFO_TYPE",
+  157: "CELL_TYPE",
+  158: "CODE_DATA_CONTAINER_TYPE",
+  159: "DESCRIPTOR_ARRAY_TYPE",
+  160: "FEEDBACK_CELL_TYPE",
+  161: "FEEDBACK_VECTOR_TYPE",
+  162: "LOAD_HANDLER_TYPE",
+  163: "PREPARSE_DATA_TYPE",
+  164: "PROPERTY_ARRAY_TYPE",
+  165: "PROPERTY_CELL_TYPE",
+  166: "SHARED_FUNCTION_INFO_TYPE",
+  167: "SMALL_ORDERED_HASH_MAP_TYPE",
+  168: "SMALL_ORDERED_HASH_SET_TYPE",
+  169: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
+  170: "STORE_HANDLER_TYPE",
+  171: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
+  172: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
+  173: "WEAK_ARRAY_LIST_TYPE",
+  174: "WEAK_CELL_TYPE",
   1024: "JS_PROXY_TYPE",
   1025: "JS_GLOBAL_OBJECT_TYPE",
   1026: "JS_GLOBAL_PROXY_TYPE",
@@ -198,8 +199,8 @@ KNOWN_MAPS = {
   ("read_only_space", 0x00139): (74, "FreeSpaceMap"),
   ("read_only_space", 0x00161): (68, "MetaMap"),
   ("read_only_space", 0x001a5): (67, "NullMap"),
-  ("read_only_space", 0x001dd): (158, "DescriptorArrayMap"),
-  ("read_only_space", 0x0020d): (153, "WeakFixedArrayMap"),
+  ("read_only_space", 0x001dd): (159, "DescriptorArrayMap"),
+  ("read_only_space", 0x0020d): (154, "WeakFixedArrayMap"),
   ("read_only_space", 0x00235): (88, "OnePointerFillerMap"),
   ("read_only_space", 0x0025d): (88, "TwoPointerFillerMap"),
   ("read_only_space", 0x002a1): (67, "UninitializedMap"),
@@ -209,71 +210,71 @@ KNOWN_MAPS = {
   ("read_only_space", 0x003b9): (67, "TheHoleMap"),
   ("read_only_space", 0x00419): (67, "BooleanMap"),
   ("read_only_space", 0x004a1): (72, "ByteArrayMap"),
-  ("read_only_space", 0x004c9): (128, "FixedArrayMap"),
-  ("read_only_space", 0x004f1): (128, "FixedCOWArrayMap"),
-  ("read_only_space", 0x00519): (131, "HashTableMap"),
+  ("read_only_space", 0x004c9): (129, "FixedArrayMap"),
+  ("read_only_space", 0x004f1): (129, "FixedCOWArrayMap"),
+  ("read_only_space", 0x00519): (132, "HashTableMap"),
   ("read_only_space", 0x00541): (64, "SymbolMap"),
   ("read_only_space", 0x00569): (40, "OneByteStringMap"),
-  ("read_only_space", 0x00591): (141, "ScopeInfoMap"),
-  ("read_only_space", 0x005b9): (165, "SharedFunctionInfoMap"),
+  ("read_only_space", 0x00591): (142, "ScopeInfoMap"),
+  ("read_only_space", 0x005b9): (166, "SharedFunctionInfoMap"),
   ("read_only_space", 0x005e1): (69, "CodeMap"),
-  ("read_only_space", 0x00609): (148, "FunctionContextMap"),
-  ("read_only_space", 0x00631): (156, "CellMap"),
-  ("read_only_space", 0x00659): (164, "GlobalPropertyCellMap"),
+  ("read_only_space", 0x00609): (149, "FunctionContextMap"),
+  ("read_only_space", 0x00631): (157, "CellMap"),
+  ("read_only_space", 0x00659): (165, "GlobalPropertyCellMap"),
   ("read_only_space", 0x00681): (71, "ForeignMap"),
-  ("read_only_space", 0x006a9): (154, "TransitionArrayMap"),
-  ("read_only_space", 0x006d1): (160, "FeedbackVectorMap"),
+  ("read_only_space", 0x006a9): (155, "TransitionArrayMap"),
+  ("read_only_space", 0x006d1): (161, "FeedbackVectorMap"),
   ("read_only_space", 0x00725): (67, "ArgumentsMarkerMap"),
   ("read_only_space", 0x00785): (67, "ExceptionMap"),
   ("read_only_space", 0x007e1): (67, "TerminationExceptionMap"),
   ("read_only_space", 0x00849): (67, "OptimizedOutMap"),
   ("read_only_space", 0x008a9): (67, "StaleRegisterMap"),
-  ("read_only_space", 0x008ed): (150, "NativeContextMap"),
-  ("read_only_space", 0x00915): (149, "ModuleContextMap"),
-  ("read_only_space", 0x0093d): (147, "EvalContextMap"),
-  ("read_only_space", 0x00965): (151, "ScriptContextMap"),
-  ("read_only_space", 0x0098d): (143, "AwaitContextMap"),
-  ("read_only_space", 0x009b5): (144, "BlockContextMap"),
-  ("read_only_space", 0x009dd): (145, "CatchContextMap"),
-  ("read_only_space", 0x00a05): (152, "WithContextMap"),
-  ("read_only_space", 0x00a2d): (146, "DebugEvaluateContextMap"),
-  ("read_only_space", 0x00a55): (142, "ScriptContextTableMap"),
-  ("read_only_space", 0x00a7d): (130, "ClosureFeedbackCellArrayMap"),
+  ("read_only_space", 0x008ed): (151, "NativeContextMap"),
+  ("read_only_space", 0x00915): (150, "ModuleContextMap"),
+  ("read_only_space", 0x0093d): (148, "EvalContextMap"),
+  ("read_only_space", 0x00965): (152, "ScriptContextMap"),
+  ("read_only_space", 0x0098d): (144, "AwaitContextMap"),
+  ("read_only_space", 0x009b5): (145, "BlockContextMap"),
+  ("read_only_space", 0x009dd): (146, "CatchContextMap"),
+  ("read_only_space", 0x00a05): (153, "WithContextMap"),
+  ("read_only_space", 0x00a2d): (147, "DebugEvaluateContextMap"),
+  ("read_only_space", 0x00a55): (143, "ScriptContextTableMap"),
+  ("read_only_space", 0x00a7d): (131, "ClosureFeedbackCellArrayMap"),
   ("read_only_space", 0x00aa5): (87, "FeedbackMetadataArrayMap"),
-  ("read_only_space", 0x00acd): (128, "ArrayListMap"),
+  ("read_only_space", 0x00acd): (129, "ArrayListMap"),
   ("read_only_space", 0x00af5): (66, "BigIntMap"),
-  ("read_only_space", 0x00b1d): (129, "ObjectBoilerplateDescriptionMap"),
+  ("read_only_space", 0x00b1d): (130, "ObjectBoilerplateDescriptionMap"),
   ("read_only_space", 0x00b45): (73, "BytecodeArrayMap"),
-  ("read_only_space", 0x00b6d): (157, "CodeDataContainerMap"),
+  ("read_only_space", 0x00b6d): (158, "CodeDataContainerMap"),
   ("read_only_space", 0x00b95): (86, "FixedDoubleArrayMap"),
-  ("read_only_space", 0x00bbd): (136, "GlobalDictionaryMap"),
-  ("read_only_space", 0x00be5): (159, "ManyClosuresCellMap"),
-  ("read_only_space", 0x00c0d): (128, "ModuleInfoMap"),
+  ("read_only_space", 0x00bbd): (137, "GlobalDictionaryMap"),
+  ("read_only_space", 0x00be5): (160, "ManyClosuresCellMap"),
+  ("read_only_space", 0x00c0d): (129, "ModuleInfoMap"),
   ("read_only_space", 0x00c35): (70, "MutableHeapNumberMap"),
-  ("read_only_space", 0x00c5d): (135, "NameDictionaryMap"),
-  ("read_only_space", 0x00c85): (159, "NoClosuresCellMap"),
-  ("read_only_space", 0x00cad): (137, "NumberDictionaryMap"),
-  ("read_only_space", 0x00cd5): (159, "OneClosureCellMap"),
-  ("read_only_space", 0x00cfd): (132, "OrderedHashMapMap"),
-  ("read_only_space", 0x00d25): (133, "OrderedHashSetMap"),
-  ("read_only_space", 0x00d4d): (134, "OrderedNameDictionaryMap"),
-  ("read_only_space", 0x00d75): (162, "PreparseDataMap"),
-  ("read_only_space", 0x00d9d): (163, "PropertyArrayMap"),
-  ("read_only_space", 0x00dc5): (155, "SideEffectCallHandlerInfoMap"),
-  ("read_only_space", 0x00ded): (155, "SideEffectFreeCallHandlerInfoMap"),
-  ("read_only_space", 0x00e15): (155, "NextCallSideEffectFreeCallHandlerInfoMap"),
-  ("read_only_space", 0x00e3d): (138, "SimpleNumberDictionaryMap"),
-  ("read_only_space", 0x00e65): (128, "SloppyArgumentsElementsMap"),
-  ("read_only_space", 0x00e8d): (166, "SmallOrderedHashMapMap"),
-  ("read_only_space", 0x00eb5): (167, "SmallOrderedHashSetMap"),
-  ("read_only_space", 0x00edd): (168, "SmallOrderedNameDictionaryMap"),
-  ("read_only_space", 0x00f05): (139, "StringTableMap"),
-  ("read_only_space", 0x00f2d): (170, "UncompiledDataWithoutPreparseDataMap"),
-  ("read_only_space", 0x00f55): (171, "UncompiledDataWithPreparseDataMap"),
-  ("read_only_space", 0x00f7d): (172, "WeakArrayListMap"),
-  ("read_only_space", 0x00fa5): (140, "EphemeronHashTableMap"),
-  ("read_only_space", 0x00fcd): (127, "EmbedderDataArrayMap"),
-  ("read_only_space", 0x00ff5): (173, "WeakCellMap"),
+  ("read_only_space", 0x00c5d): (136, "NameDictionaryMap"),
+  ("read_only_space", 0x00c85): (160, "NoClosuresCellMap"),
+  ("read_only_space", 0x00cad): (138, "NumberDictionaryMap"),
+  ("read_only_space", 0x00cd5): (160, "OneClosureCellMap"),
+  ("read_only_space", 0x00cfd): (133, "OrderedHashMapMap"),
+  ("read_only_space", 0x00d25): (134, "OrderedHashSetMap"),
+  ("read_only_space", 0x00d4d): (135, "OrderedNameDictionaryMap"),
+  ("read_only_space", 0x00d75): (163, "PreparseDataMap"),
+  ("read_only_space", 0x00d9d): (164, "PropertyArrayMap"),
+  ("read_only_space", 0x00dc5): (156, "SideEffectCallHandlerInfoMap"),
+  ("read_only_space", 0x00ded): (156, "SideEffectFreeCallHandlerInfoMap"),
+  ("read_only_space", 0x00e15): (156, "NextCallSideEffectFreeCallHandlerInfoMap"),
+  ("read_only_space", 0x00e3d): (139, "SimpleNumberDictionaryMap"),
+  ("read_only_space", 0x00e65): (129, "SloppyArgumentsElementsMap"),
+  ("read_only_space", 0x00e8d): (167, "SmallOrderedHashMapMap"),
+  ("read_only_space", 0x00eb5): (168, "SmallOrderedHashSetMap"),
+  ("read_only_space", 0x00edd): (169, "SmallOrderedNameDictionaryMap"),
+  ("read_only_space", 0x00f05): (140, "StringTableMap"),
+  ("read_only_space", 0x00f2d): (171, "UncompiledDataWithoutPreparseDataMap"),
+  ("read_only_space", 0x00f55): (172, "UncompiledDataWithPreparseDataMap"),
+  ("read_only_space", 0x00f7d): (173, "WeakArrayListMap"),
+  ("read_only_space", 0x00fa5): (141, "EphemeronHashTableMap"),
+  ("read_only_space", 0x00fcd): (128, "EmbedderDataArrayMap"),
+  ("read_only_space", 0x00ff5): (174, "WeakCellMap"),
   ("read_only_space", 0x0101d): (58, "NativeSourceStringMap"),
   ("read_only_space", 0x01045): (32, "StringMap"),
   ("read_only_space", 0x0106d): (41, "ConsOneByteStringMap"),
@@ -304,7 +305,7 @@ KNOWN_MAPS = {
   ("read_only_space", 0x01455): (84, "FixedBigInt64ArrayMap"),
   ("read_only_space", 0x0147d): (67, "SelfReferenceMarkerMap"),
   ("read_only_space", 0x014b1): (98, "EnumCacheMap"),
-  ("read_only_space", 0x01501): (115, "ArrayBoilerplateDescriptionMap"),
+  ("read_only_space", 0x01501): (116, "ArrayBoilerplateDescriptionMap"),
   ("read_only_space", 0x016d9): (101, "InterceptorInfoMap"),
   ("read_only_space", 0x0357d): (89, "AccessCheckInfoMap"),
   ("read_only_space", 0x035a5): (90, "AccessorInfoMap"),
@@ -328,27 +329,28 @@ KNOWN_MAPS = {
   ("read_only_space", 0x03875): (110, "SourcePositionTableWithFrameCacheMap"),
   ("read_only_space", 0x0389d): (111, "StackFrameInfoMap"),
   ("read_only_space", 0x038c5): (112, "StackTraceFrameMap"),
-  ("read_only_space", 0x038ed): (113, "Tuple2Map"),
-  ("read_only_space", 0x03915): (114, "Tuple3Map"),
-  ("read_only_space", 0x0393d): (116, "WasmCapiFunctionDataMap"),
-  ("read_only_space", 0x03965): (117, "WasmDebugInfoMap"),
-  ("read_only_space", 0x0398d): (118, "WasmExceptionTagMap"),
-  ("read_only_space", 0x039b5): (119, "WasmExportedFunctionDataMap"),
-  ("read_only_space", 0x039dd): (120, "CallableTaskMap"),
-  ("read_only_space", 0x03a05): (121, "CallbackTaskMap"),
-  ("read_only_space", 0x03a2d): (122, "PromiseFulfillReactionJobTaskMap"),
-  ("read_only_space", 0x03a55): (123, "PromiseRejectReactionJobTaskMap"),
-  ("read_only_space", 0x03a7d): (124, "PromiseResolveThenableJobTaskMap"),
-  ("read_only_space", 0x03aa5): (125, "FinalizationGroupCleanupJobTaskMap"),
-  ("read_only_space", 0x03acd): (126, "AllocationSiteWithWeakNextMap"),
-  ("read_only_space", 0x03af5): (126, "AllocationSiteWithoutWeakNextMap"),
-  ("read_only_space", 0x03b1d): (161, "LoadHandler1Map"),
-  ("read_only_space", 0x03b45): (161, "LoadHandler2Map"),
-  ("read_only_space", 0x03b6d): (161, "LoadHandler3Map"),
-  ("read_only_space", 0x03b95): (169, "StoreHandler0Map"),
-  ("read_only_space", 0x03bbd): (169, "StoreHandler1Map"),
-  ("read_only_space", 0x03be5): (169, "StoreHandler2Map"),
-  ("read_only_space", 0x03c0d): (169, "StoreHandler3Map"),
+  ("read_only_space", 0x038ed): (113, "TemplateObjectDescriptionMap"),
+  ("read_only_space", 0x03915): (114, "Tuple2Map"),
+  ("read_only_space", 0x0393d): (115, "Tuple3Map"),
+  ("read_only_space", 0x03965): (117, "WasmCapiFunctionDataMap"),
+  ("read_only_space", 0x0398d): (118, "WasmDebugInfoMap"),
+  ("read_only_space", 0x039b5): (119, "WasmExceptionTagMap"),
+  ("read_only_space", 0x039dd): (120, "WasmExportedFunctionDataMap"),
+  ("read_only_space", 0x03a05): (121, "CallableTaskMap"),
+  ("read_only_space", 0x03a2d): (122, "CallbackTaskMap"),
+  ("read_only_space", 0x03a55): (123, "PromiseFulfillReactionJobTaskMap"),
+  ("read_only_space", 0x03a7d): (124, "PromiseRejectReactionJobTaskMap"),
+  ("read_only_space", 0x03aa5): (125, "PromiseResolveThenableJobTaskMap"),
+  ("read_only_space", 0x03acd): (126, "FinalizationGroupCleanupJobTaskMap"),
+  ("read_only_space", 0x03af5): (127, "AllocationSiteWithWeakNextMap"),
+  ("read_only_space", 0x03b1d): (127, "AllocationSiteWithoutWeakNextMap"),
+  ("read_only_space", 0x03b45): (162, "LoadHandler1Map"),
+  ("read_only_space", 0x03b6d): (162, "LoadHandler2Map"),
+  ("read_only_space", 0x03b95): (162, "LoadHandler3Map"),
+  ("read_only_space", 0x03bbd): (170, "StoreHandler0Map"),
+  ("read_only_space", 0x03be5): (170, "StoreHandler1Map"),
+  ("read_only_space", 0x03c0d): (170, "StoreHandler2Map"),
+  ("read_only_space", 0x03c35): (170, "StoreHandler3Map"),
   ("map_space", 0x00139): (1057, "ExternalMap"),
   ("map_space", 0x00161): (1073, "JSMessageObjectMap"),
 }