Revert "[serializer] share class positions tuple across contexts"

This reverts commit a1b431d7.

Reason for revert: https://ci.chromium.org/p/v8/builders/luci.v8.ci/V8%20Linux%20-%20nosnap%20-%20debug/22809

Original change's description:
> [serializer] share class positions tuple across contexts
> 
> Class positions is a struct that stores the start and end positions of a class
> literal. It is stored both on class objects, and the template used to
> instantiate class objects.
> 
> The template is reachable from the bytecode array and therefore serialized by
> the startup serializer. Class objects are context-dependent and therefore
> serialized by the partial serializer. Serializing class positions from both
> serializers violates the assumption that we don't serialize any object twice.
> 
> R=​gsathya@chromium.org
> 
> Bug: v8:8761
> Change-Id: If22c554cc7396d63998a015454ce0c67a7d2e05c
> Reviewed-on: https://chromium-review.googlesource.com/c/1444956
> Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
> Reviewed-by: Sathya Gunasekaran <gsathya@chromium.org>
> Commit-Queue: Yang Guo <yangguo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#59292}

TBR=yangguo@chromium.org,mstarzinger@chromium.org,gsathya@chromium.org

Change-Id: I9f3fd1b29b5991b450223f8b27dfc7aa7e5a3171
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:8761
Reviewed-on: https://chromium-review.googlesource.com/c/1450116Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59300}

src/compiler/types.cc

@@ -342,7 +342,6 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) {
     case ALIASED_ARGUMENTS_ENTRY_TYPE:
     case PROMISE_CAPABILITY_TYPE:
     case PROMISE_REACTION_TYPE:
-    case CLASS_POSITIONS_TYPE:
     case DEBUG_INFO_TYPE:
     case STACK_FRAME_INFO_TYPE:
     case SMALL_ORDERED_HASH_MAP_TYPE:

src/heap/factory.cc

@@ -3806,14 +3806,6 @@ Handle<String> Factory::NumberToString(Smi number, bool check_cache) {
                                 check_cache);
 }
 
-Handle<ClassPositions> Factory::NewClassPositions(int start, int end) {
-  Handle<ClassPositions> class_positions =
-      Handle<ClassPositions>::cast(NewStruct(CLASS_POSITIONS_TYPE, TENURED));
-  class_positions->set_start(start);
-  class_positions->set_end(end);
-  return class_positions;
-}
-
 Handle<DebugInfo> Factory::NewDebugInfo(Handle<SharedFunctionInfo> shared) {
   DCHECK(!shared->HasDebugInfo());
   Heap* heap = isolate()->heap();

src/heap/factory.h

@@ -892,7 +892,6 @@ class V8_EXPORT_PRIVATE Factory {
       MessageTemplate message, Handle<Object> argument, int start_position,
       int end_position, Handle<Script> script, Handle<Object> stack_frames);
 
-  Handle<ClassPositions> NewClassPositions(int start, int end);
   Handle<DebugInfo> NewDebugInfo(Handle<SharedFunctionInfo> shared);
 
   Handle<CoverageInfo> NewCoverageInfo(const ZoneVector<SourceRange>& slots);

src/objects-debug.cc

@@ -1809,12 +1809,6 @@ void Tuple3::Tuple3Verify(Isolate* isolate) {
   VerifyObjectField(isolate, kValue3Offset);
 }
 
-void ClassPositions::ClassPositionsVerify(Isolate* isolate) {
-  CHECK(IsClassPositions());
-  VerifySmiField(kStartOffset);
-  VerifySmiField(kEndOffset);
-}
-
 void ObjectBoilerplateDescription::ObjectBoilerplateDescriptionVerify(
     Isolate* isolate) {
   CHECK(IsObjectBoilerplateDescription());

src/objects-definitions.h

@@ -98,7 +98,6 @@ namespace internal {
   V(ALLOCATION_MEMENTO_TYPE)                                       \
   V(ASM_WASM_DATA_TYPE)                                            \
   V(ASYNC_GENERATOR_REQUEST_TYPE)                                  \
-  V(CLASS_POSITIONS_TYPE)                                          \
   V(DEBUG_INFO_TYPE)                                               \
   V(FUNCTION_TEMPLATE_INFO_TYPE)                                   \
   V(FUNCTION_TEMPLATE_RARE_DATA_TYPE)                              \
@@ -322,7 +321,6 @@ namespace internal {
   V(_, ASM_WASM_DATA_TYPE, AsmWasmData, asm_wasm_data)                        \
   V(_, ASYNC_GENERATOR_REQUEST_TYPE, AsyncGeneratorRequest,                   \
     async_generator_request)                                                  \
-  V(_, CLASS_POSITIONS_TYPE, ClassPositions, class_positions)                 \
   V(_, DEBUG_INFO_TYPE, DebugInfo, debug_info)                                \
   V(_, FUNCTION_TEMPLATE_INFO_TYPE, FunctionTemplateInfo,                     \
     function_template_info)                                                   \

src/objects-printer.cc

@@ -1744,13 +1744,6 @@ void Tuple3::Tuple3Print(std::ostream& os) {  // NOLINT
   os << "\n";
 }
 
-void ClassPositions::ClassPositionsPrint(std::ostream& os) {  // NOLINT
-  PrintHeader(os, "ClassPositions");
-  os << "\n - start position: " << start();
-  os << "\n - end position: " << end();
-  os << "\n";
-}
-
 void ArrayBoilerplateDescription::ArrayBoilerplateDescriptionPrint(
     std::ostream& os) {  // NOLINT
   PrintHeader(os, "ArrayBoilerplateDescription");

src/objects.cc

@@ -3146,10 +3146,6 @@ void Tuple3::BriefPrintDetails(std::ostream& os) {
      << Brief(value3());
 }
 
-void ClassPositions::BriefPrintDetails(std::ostream& os) {
-  os << " " << start() << ", " << end();
-}
-
 void ArrayBoilerplateDescription::BriefPrintDetails(std::ostream& os) {
   os << " " << elements_kind() << ", " << Brief(constant_elements());
 }
@@ -9434,11 +9430,10 @@ Handle<String> JSFunction::ToString(Handle<JSFunction> function) {
   // Check if we should print {function} as a class.
   Handle<Object> maybe_class_positions = JSReceiver::GetDataProperty(
       function, isolate->factory()->class_positions_symbol());
-  if (maybe_class_positions->IsClassPositions()) {
-    ClassPositions class_positions =
-        ClassPositions::cast(*maybe_class_positions);
-    int start_position = class_positions->start();
-    int end_position = class_positions->end();
+  if (maybe_class_positions->IsTuple2()) {
+    Tuple2 class_positions = Tuple2::cast(*maybe_class_positions);
+    int start_position = Smi::ToInt(class_positions->value1());
+    int end_position = Smi::ToInt(class_positions->value2());
     Handle<String> script_source(
         String::cast(Script::cast(shared_info->script())->source()), isolate);
     return isolate->factory()->NewSubString(script_source, start_position,

src/objects/instance-type.h

@@ -171,7 +171,6 @@ enum InstanceType : uint16_t {
   ALLOCATION_MEMENTO_TYPE,
   ASM_WASM_DATA_TYPE,
   ASYNC_GENERATOR_REQUEST_TYPE,
-  CLASS_POSITIONS_TYPE,
   DEBUG_INFO_TYPE,
   FUNCTION_TEMPLATE_INFO_TYPE,
   FUNCTION_TEMPLATE_RARE_DATA_TYPE,

src/objects/literal-objects.cc

@@ -493,8 +493,10 @@ Handle<ClassBoilerplate> ClassBoilerplate::BuildClassBoilerplate(
                             attribs);
   }
   {
-    Handle<ClassPositions> class_positions = factory->NewClassPositions(
-        expr->start_position(), expr->end_position());
+    Handle<Smi> start_position(Smi::FromInt(expr->start_position()), isolate);
+    Handle<Smi> end_position(Smi::FromInt(expr->end_position()), isolate);
+    Handle<Tuple2> class_positions =
+        factory->NewTuple2(start_position, end_position, NOT_TENURED);
     static_desc.AddConstant(isolate, factory->class_positions_symbol(),
                             class_positions, DONT_ENUM);
   }

src/objects/struct-inl.h

@@ -24,15 +24,11 @@ Tuple2::Tuple2(Address ptr) : Struct(ptr) {}
 Tuple3::Tuple3(Address ptr) : Tuple2(ptr) {}
 OBJECT_CONSTRUCTORS_IMPL(AccessorPair, Struct)
 
-OBJECT_CONSTRUCTORS_IMPL(ClassPositions, Struct)
-
 CAST_ACCESSOR(AccessorPair)
 CAST_ACCESSOR(Struct)
 CAST_ACCESSOR(Tuple2)
 CAST_ACCESSOR(Tuple3)
 
-CAST_ACCESSOR(ClassPositions)
-
 void Struct::InitializeBody(int object_size) {
   Object value = GetReadOnlyRoots().undefined_value();
   for (int offset = kHeaderSize; offset < object_size; offset += kPointerSize) {
@@ -47,9 +43,6 @@ ACCESSORS(Tuple3, value3, Object, kValue3Offset)
 ACCESSORS(AccessorPair, getter, Object, kGetterOffset)
 ACCESSORS(AccessorPair, setter, Object, kSetterOffset)
 
-SMI_ACCESSORS(ClassPositions, start, kStartOffset)
-SMI_ACCESSORS(ClassPositions, end, kEndOffset)
-
 Object AccessorPair::get(AccessorComponent component) {
   return component == ACCESSOR_GETTER ? getter() : setter();
 }

src/objects/struct.h

@@ -119,31 +119,6 @@ class AccessorPair : public Struct {
   OBJECT_CONSTRUCTORS(AccessorPair, Struct);
 };
 
-class ClassPositions : public Struct {
- public:
-  DECL_INT_ACCESSORS(start)
-  DECL_INT_ACCESSORS(end)
-
-  DECL_CAST(ClassPositions)
-
-  // Dispatched behavior.
-  DECL_PRINTER(ClassPositions)
-  DECL_VERIFIER(ClassPositions)
-  void BriefPrintDetails(std::ostream& os);
-
-// Layout description.
-#define CLASS_POSITIONS_FIELDS(V) \
-  V(kStartOffset, kTaggedSize)    \
-  V(kEndOffset, kTaggedSize)      \
-  /* Total size. */               \
-  V(kSize, 0)
-
-  DEFINE_FIELD_OFFSET_CONSTANTS(HeapObject::kHeaderSize, CLASS_POSITIONS_FIELDS)
-#undef CLASS_POSITIONS_FIELDS
-
-  OBJECT_CONSTRUCTORS(ClassPositions, Struct);
-};
-
 }  // namespace internal
 }  // namespace v8
 

src/snapshot/partial-serializer.cc

@@ -133,7 +133,7 @@ bool PartialSerializer::ShouldBeInThePartialSnapshotCache(HeapObject o) {
   DCHECK(!o->IsScript());
   return o->IsName() || o->IsSharedFunctionInfo() || o->IsHeapNumber() ||
          o->IsCode() || o->IsScopeInfo() || o->IsAccessorInfo() ||
-         o->IsTemplateInfo() || o->IsClassPositions() ||
+         o->IsTemplateInfo() ||
          o->map() == ReadOnlyRoots(startup_serializer_->isolate())
                          .fixed_cow_array_map();
 }

test/cctest/test-serialize.cc

@@ -3923,27 +3923,5 @@ TEST(CachedCompileFunctionInContext) {
   }
 }
 
-TEST(SnapshotCreatorAnonClassWithKeep) {
-  DisableAlwaysOpt();
-  v8::SnapshotCreator creator;
-  v8::Isolate* isolate = creator.GetIsolate();
-  {
-    v8::HandleScope handle_scope(isolate);
-    {
-      v8::Local<v8::Context> context = v8::Context::New(isolate);
-      v8::Context::Scope context_scope(context);
-      CompileRun(
-          "function Foo() { return class {}; } \n"
-          "class Bar extends Foo() {}\n"
-          "Foo()\n");
-      creator.SetDefaultContext(context);
-    }
-  }
-  v8::StartupData blob =
-      creator.CreateBlob(v8::SnapshotCreator::FunctionCodeHandling::kKeep);
-
-  delete[] blob.data;
-}
-
 }  // namespace internal
 }  // namespace v8

tools/v8heapconst.py

@@ -61,79 +61,78 @@ INSTANCE_TYPES = {
   157: "ALLOCATION_MEMENTO_TYPE",
   158: "ASM_WASM_DATA_TYPE",
   159: "ASYNC_GENERATOR_REQUEST_TYPE",
-  160: "CLASS_POSITIONS_TYPE",
-  161: "DEBUG_INFO_TYPE",
-  162: "FUNCTION_TEMPLATE_INFO_TYPE",
-  163: "FUNCTION_TEMPLATE_RARE_DATA_TYPE",
-  164: "INTERCEPTOR_INFO_TYPE",
-  165: "INTERPRETER_DATA_TYPE",
-  166: "MODULE_INFO_ENTRY_TYPE",
-  167: "MODULE_TYPE",
-  168: "OBJECT_TEMPLATE_INFO_TYPE",
-  169: "PROMISE_CAPABILITY_TYPE",
-  170: "PROMISE_REACTION_TYPE",
-  171: "PROTOTYPE_INFO_TYPE",
-  172: "SCRIPT_TYPE",
-  173: "STACK_FRAME_INFO_TYPE",
-  174: "TUPLE2_TYPE",
-  175: "TUPLE3_TYPE",
-  176: "ARRAY_BOILERPLATE_DESCRIPTION_TYPE",
-  177: "WASM_DEBUG_INFO_TYPE",
-  178: "WASM_EXCEPTION_TAG_TYPE",
-  179: "WASM_EXPORTED_FUNCTION_DATA_TYPE",
-  180: "CALLABLE_TASK_TYPE",
-  181: "CALLBACK_TASK_TYPE",
-  182: "PROMISE_FULFILL_REACTION_JOB_TASK_TYPE",
-  183: "PROMISE_REJECT_REACTION_JOB_TASK_TYPE",
-  184: "PROMISE_RESOLVE_THENABLE_JOB_TASK_TYPE",
-  185: "FINALIZATION_GROUP_CLEANUP_JOB_TASK_TYPE",
-  186: "ALLOCATION_SITE_TYPE",
-  187: "EMBEDDER_DATA_ARRAY_TYPE",
-  188: "FIXED_ARRAY_TYPE",
-  189: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
-  190: "HASH_TABLE_TYPE",
-  191: "ORDERED_HASH_MAP_TYPE",
-  192: "ORDERED_HASH_SET_TYPE",
-  193: "ORDERED_NAME_DICTIONARY_TYPE",
-  194: "NAME_DICTIONARY_TYPE",
-  195: "GLOBAL_DICTIONARY_TYPE",
-  196: "NUMBER_DICTIONARY_TYPE",
-  197: "SIMPLE_NUMBER_DICTIONARY_TYPE",
-  198: "STRING_TABLE_TYPE",
-  199: "EPHEMERON_HASH_TABLE_TYPE",
-  200: "SCOPE_INFO_TYPE",
-  201: "SCRIPT_CONTEXT_TABLE_TYPE",
-  202: "AWAIT_CONTEXT_TYPE",
-  203: "BLOCK_CONTEXT_TYPE",
-  204: "CATCH_CONTEXT_TYPE",
-  205: "DEBUG_EVALUATE_CONTEXT_TYPE",
-  206: "EVAL_CONTEXT_TYPE",
-  207: "FUNCTION_CONTEXT_TYPE",
-  208: "MODULE_CONTEXT_TYPE",
-  209: "NATIVE_CONTEXT_TYPE",
-  210: "SCRIPT_CONTEXT_TYPE",
-  211: "WITH_CONTEXT_TYPE",
-  212: "WEAK_FIXED_ARRAY_TYPE",
-  213: "TRANSITION_ARRAY_TYPE",
-  214: "CALL_HANDLER_INFO_TYPE",
-  215: "CELL_TYPE",
-  216: "CODE_DATA_CONTAINER_TYPE",
-  217: "DESCRIPTOR_ARRAY_TYPE",
-  218: "FEEDBACK_CELL_TYPE",
-  219: "FEEDBACK_VECTOR_TYPE",
-  220: "LOAD_HANDLER_TYPE",
-  221: "PREPARSE_DATA_TYPE",
-  222: "PROPERTY_ARRAY_TYPE",
-  223: "PROPERTY_CELL_TYPE",
-  224: "SHARED_FUNCTION_INFO_TYPE",
-  225: "SMALL_ORDERED_HASH_MAP_TYPE",
-  226: "SMALL_ORDERED_HASH_SET_TYPE",
-  227: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
-  228: "STORE_HANDLER_TYPE",
-  229: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
-  230: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
-  231: "WEAK_ARRAY_LIST_TYPE",
-  232: "WEAK_CELL_TYPE",
+  160: "DEBUG_INFO_TYPE",
+  161: "FUNCTION_TEMPLATE_INFO_TYPE",
+  162: "FUNCTION_TEMPLATE_RARE_DATA_TYPE",
+  163: "INTERCEPTOR_INFO_TYPE",
+  164: "INTERPRETER_DATA_TYPE",
+  165: "MODULE_INFO_ENTRY_TYPE",
+  166: "MODULE_TYPE",
+  167: "OBJECT_TEMPLATE_INFO_TYPE",
+  168: "PROMISE_CAPABILITY_TYPE",
+  169: "PROMISE_REACTION_TYPE",
+  170: "PROTOTYPE_INFO_TYPE",
+  171: "SCRIPT_TYPE",
+  172: "STACK_FRAME_INFO_TYPE",
+  173: "TUPLE2_TYPE",
+  174: "TUPLE3_TYPE",
+  175: "ARRAY_BOILERPLATE_DESCRIPTION_TYPE",
+  176: "WASM_DEBUG_INFO_TYPE",
+  177: "WASM_EXCEPTION_TAG_TYPE",
+  178: "WASM_EXPORTED_FUNCTION_DATA_TYPE",
+  179: "CALLABLE_TASK_TYPE",
+  180: "CALLBACK_TASK_TYPE",
+  181: "PROMISE_FULFILL_REACTION_JOB_TASK_TYPE",
+  182: "PROMISE_REJECT_REACTION_JOB_TASK_TYPE",
+  183: "PROMISE_RESOLVE_THENABLE_JOB_TASK_TYPE",
+  184: "FINALIZATION_GROUP_CLEANUP_JOB_TASK_TYPE",
+  185: "ALLOCATION_SITE_TYPE",
+  186: "EMBEDDER_DATA_ARRAY_TYPE",
+  187: "FIXED_ARRAY_TYPE",
+  188: "OBJECT_BOILERPLATE_DESCRIPTION_TYPE",
+  189: "HASH_TABLE_TYPE",
+  190: "ORDERED_HASH_MAP_TYPE",
+  191: "ORDERED_HASH_SET_TYPE",
+  192: "ORDERED_NAME_DICTIONARY_TYPE",
+  193: "NAME_DICTIONARY_TYPE",
+  194: "GLOBAL_DICTIONARY_TYPE",
+  195: "NUMBER_DICTIONARY_TYPE",
+  196: "SIMPLE_NUMBER_DICTIONARY_TYPE",
+  197: "STRING_TABLE_TYPE",
+  198: "EPHEMERON_HASH_TABLE_TYPE",
+  199: "SCOPE_INFO_TYPE",
+  200: "SCRIPT_CONTEXT_TABLE_TYPE",
+  201: "AWAIT_CONTEXT_TYPE",
+  202: "BLOCK_CONTEXT_TYPE",
+  203: "CATCH_CONTEXT_TYPE",
+  204: "DEBUG_EVALUATE_CONTEXT_TYPE",
+  205: "EVAL_CONTEXT_TYPE",
+  206: "FUNCTION_CONTEXT_TYPE",
+  207: "MODULE_CONTEXT_TYPE",
+  208: "NATIVE_CONTEXT_TYPE",
+  209: "SCRIPT_CONTEXT_TYPE",
+  210: "WITH_CONTEXT_TYPE",
+  211: "WEAK_FIXED_ARRAY_TYPE",
+  212: "TRANSITION_ARRAY_TYPE",
+  213: "CALL_HANDLER_INFO_TYPE",
+  214: "CELL_TYPE",
+  215: "CODE_DATA_CONTAINER_TYPE",
+  216: "DESCRIPTOR_ARRAY_TYPE",
+  217: "FEEDBACK_CELL_TYPE",
+  218: "FEEDBACK_VECTOR_TYPE",
+  219: "LOAD_HANDLER_TYPE",
+  220: "PREPARSE_DATA_TYPE",
+  221: "PROPERTY_ARRAY_TYPE",
+  222: "PROPERTY_CELL_TYPE",
+  223: "SHARED_FUNCTION_INFO_TYPE",
+  224: "SMALL_ORDERED_HASH_MAP_TYPE",
+  225: "SMALL_ORDERED_HASH_SET_TYPE",
+  226: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
+  227: "STORE_HANDLER_TYPE",
+  228: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
+  229: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
+  230: "WEAK_ARRAY_LIST_TYPE",
+  231: "WEAK_CELL_TYPE",
   1024: "JS_PROXY_TYPE",
   1025: "JS_GLOBAL_OBJECT_TYPE",
   1026: "JS_GLOBAL_PROXY_TYPE",
@@ -197,8 +196,8 @@ KNOWN_MAPS = {
   ("RO_SPACE", 0x00139): (138, "FreeSpaceMap"),
   ("RO_SPACE", 0x00189): (132, "MetaMap"),
   ("RO_SPACE", 0x00209): (131, "NullMap"),
-  ("RO_SPACE", 0x00271): (217, "DescriptorArrayMap"),
-  ("RO_SPACE", 0x002d1): (212, "WeakFixedArrayMap"),
+  ("RO_SPACE", 0x00271): (216, "DescriptorArrayMap"),
+  ("RO_SPACE", 0x002d1): (211, "WeakFixedArrayMap"),
   ("RO_SPACE", 0x00321): (152, "OnePointerFillerMap"),
   ("RO_SPACE", 0x00371): (152, "TwoPointerFillerMap"),
   ("RO_SPACE", 0x003f1): (131, "UninitializedMap"),
@@ -208,71 +207,71 @@ KNOWN_MAPS = {
   ("RO_SPACE", 0x005e1): (131, "TheHoleMap"),
   ("RO_SPACE", 0x00689): (131, "BooleanMap"),
   ("RO_SPACE", 0x00761): (136, "ByteArrayMap"),
-  ("RO_SPACE", 0x007b1): (188, "FixedArrayMap"),
-  ("RO_SPACE", 0x00801): (188, "FixedCOWArrayMap"),
-  ("RO_SPACE", 0x00851): (190, "HashTableMap"),
+  ("RO_SPACE", 0x007b1): (187, "FixedArrayMap"),
+  ("RO_SPACE", 0x00801): (187, "FixedCOWArrayMap"),
+  ("RO_SPACE", 0x00851): (189, "HashTableMap"),
   ("RO_SPACE", 0x008a1): (128, "SymbolMap"),
   ("RO_SPACE", 0x008f1): (72, "OneByteStringMap"),
-  ("RO_SPACE", 0x00941): (200, "ScopeInfoMap"),
-  ("RO_SPACE", 0x00991): (224, "SharedFunctionInfoMap"),
+  ("RO_SPACE", 0x00941): (199, "ScopeInfoMap"),
+  ("RO_SPACE", 0x00991): (223, "SharedFunctionInfoMap"),
   ("RO_SPACE", 0x009e1): (133, "CodeMap"),
-  ("RO_SPACE", 0x00a31): (207, "FunctionContextMap"),
-  ("RO_SPACE", 0x00a81): (215, "CellMap"),
-  ("RO_SPACE", 0x00ad1): (223, "GlobalPropertyCellMap"),
+  ("RO_SPACE", 0x00a31): (206, "FunctionContextMap"),
+  ("RO_SPACE", 0x00a81): (214, "CellMap"),
+  ("RO_SPACE", 0x00ad1): (222, "GlobalPropertyCellMap"),
   ("RO_SPACE", 0x00b21): (135, "ForeignMap"),
-  ("RO_SPACE", 0x00b71): (213, "TransitionArrayMap"),
-  ("RO_SPACE", 0x00bc1): (219, "FeedbackVectorMap"),
+  ("RO_SPACE", 0x00b71): (212, "TransitionArrayMap"),
+  ("RO_SPACE", 0x00bc1): (218, "FeedbackVectorMap"),
   ("RO_SPACE", 0x00c61): (131, "ArgumentsMarkerMap"),
   ("RO_SPACE", 0x00d01): (131, "ExceptionMap"),
   ("RO_SPACE", 0x00da1): (131, "TerminationExceptionMap"),
   ("RO_SPACE", 0x00e49): (131, "OptimizedOutMap"),
   ("RO_SPACE", 0x00ee9): (131, "StaleRegisterMap"),
-  ("RO_SPACE", 0x00f59): (209, "NativeContextMap"),
-  ("RO_SPACE", 0x00fa9): (208, "ModuleContextMap"),
-  ("RO_SPACE", 0x00ff9): (206, "EvalContextMap"),
-  ("RO_SPACE", 0x01049): (210, "ScriptContextMap"),
-  ("RO_SPACE", 0x01099): (202, "AwaitContextMap"),
-  ("RO_SPACE", 0x010e9): (203, "BlockContextMap"),
-  ("RO_SPACE", 0x01139): (204, "CatchContextMap"),
-  ("RO_SPACE", 0x01189): (211, "WithContextMap"),
-  ("RO_SPACE", 0x011d9): (205, "DebugEvaluateContextMap"),
-  ("RO_SPACE", 0x01229): (201, "ScriptContextTableMap"),
+  ("RO_SPACE", 0x00f59): (208, "NativeContextMap"),
+  ("RO_SPACE", 0x00fa9): (207, "ModuleContextMap"),
+  ("RO_SPACE", 0x00ff9): (205, "EvalContextMap"),
+  ("RO_SPACE", 0x01049): (209, "ScriptContextMap"),
+  ("RO_SPACE", 0x01099): (201, "AwaitContextMap"),
+  ("RO_SPACE", 0x010e9): (202, "BlockContextMap"),
+  ("RO_SPACE", 0x01139): (203, "CatchContextMap"),
+  ("RO_SPACE", 0x01189): (210, "WithContextMap"),
+  ("RO_SPACE", 0x011d9): (204, "DebugEvaluateContextMap"),
+  ("RO_SPACE", 0x01229): (200, "ScriptContextTableMap"),
   ("RO_SPACE", 0x01279): (151, "FeedbackMetadataArrayMap"),
-  ("RO_SPACE", 0x012c9): (188, "ArrayListMap"),
+  ("RO_SPACE", 0x012c9): (187, "ArrayListMap"),
   ("RO_SPACE", 0x01319): (130, "BigIntMap"),
-  ("RO_SPACE", 0x01369): (189, "ObjectBoilerplateDescriptionMap"),
+  ("RO_SPACE", 0x01369): (188, "ObjectBoilerplateDescriptionMap"),
   ("RO_SPACE", 0x013b9): (137, "BytecodeArrayMap"),
-  ("RO_SPACE", 0x01409): (216, "CodeDataContainerMap"),
+  ("RO_SPACE", 0x01409): (215, "CodeDataContainerMap"),
   ("RO_SPACE", 0x01459): (150, "FixedDoubleArrayMap"),
-  ("RO_SPACE", 0x014a9): (195, "GlobalDictionaryMap"),
-  ("RO_SPACE", 0x014f9): (218, "ManyClosuresCellMap"),
-  ("RO_SPACE", 0x01549): (188, "ModuleInfoMap"),
+  ("RO_SPACE", 0x014a9): (194, "GlobalDictionaryMap"),
+  ("RO_SPACE", 0x014f9): (217, "ManyClosuresCellMap"),
+  ("RO_SPACE", 0x01549): (187, "ModuleInfoMap"),
   ("RO_SPACE", 0x01599): (134, "MutableHeapNumberMap"),
-  ("RO_SPACE", 0x015e9): (194, "NameDictionaryMap"),
-  ("RO_SPACE", 0x01639): (218, "NoClosuresCellMap"),
-  ("RO_SPACE", 0x01689): (218, "NoFeedbackCellMap"),
-  ("RO_SPACE", 0x016d9): (196, "NumberDictionaryMap"),
-  ("RO_SPACE", 0x01729): (218, "OneClosureCellMap"),
-  ("RO_SPACE", 0x01779): (191, "OrderedHashMapMap"),
-  ("RO_SPACE", 0x017c9): (192, "OrderedHashSetMap"),
-  ("RO_SPACE", 0x01819): (193, "OrderedNameDictionaryMap"),
-  ("RO_SPACE", 0x01869): (221, "PreparseDataMap"),
-  ("RO_SPACE", 0x018b9): (222, "PropertyArrayMap"),
-  ("RO_SPACE", 0x01909): (214, "SideEffectCallHandlerInfoMap"),
-  ("RO_SPACE", 0x01959): (214, "SideEffectFreeCallHandlerInfoMap"),
-  ("RO_SPACE", 0x019a9): (214, "NextCallSideEffectFreeCallHandlerInfoMap"),
-  ("RO_SPACE", 0x019f9): (197, "SimpleNumberDictionaryMap"),
-  ("RO_SPACE", 0x01a49): (188, "SloppyArgumentsElementsMap"),
-  ("RO_SPACE", 0x01a99): (225, "SmallOrderedHashMapMap"),
-  ("RO_SPACE", 0x01ae9): (226, "SmallOrderedHashSetMap"),
-  ("RO_SPACE", 0x01b39): (227, "SmallOrderedNameDictionaryMap"),
-  ("RO_SPACE", 0x01b89): (198, "StringTableMap"),
-  ("RO_SPACE", 0x01bd9): (229, "UncompiledDataWithoutPreparseDataMap"),
-  ("RO_SPACE", 0x01c29): (230, "UncompiledDataWithPreparseDataMap"),
-  ("RO_SPACE", 0x01c79): (231, "WeakArrayListMap"),
-  ("RO_SPACE", 0x01cc9): (199, "EphemeronHashTableMap"),
-  ("RO_SPACE", 0x01d19): (187, "EmbedderDataArrayMap"),
-  ("RO_SPACE", 0x01d69): (232, "WeakCellMap"),
+  ("RO_SPACE", 0x015e9): (193, "NameDictionaryMap"),
+  ("RO_SPACE", 0x01639): (217, "NoClosuresCellMap"),
+  ("RO_SPACE", 0x01689): (217, "NoFeedbackCellMap"),
+  ("RO_SPACE", 0x016d9): (195, "NumberDictionaryMap"),
+  ("RO_SPACE", 0x01729): (217, "OneClosureCellMap"),
+  ("RO_SPACE", 0x01779): (190, "OrderedHashMapMap"),
+  ("RO_SPACE", 0x017c9): (191, "OrderedHashSetMap"),
+  ("RO_SPACE", 0x01819): (192, "OrderedNameDictionaryMap"),
+  ("RO_SPACE", 0x01869): (220, "PreparseDataMap"),
+  ("RO_SPACE", 0x018b9): (221, "PropertyArrayMap"),
+  ("RO_SPACE", 0x01909): (213, "SideEffectCallHandlerInfoMap"),
+  ("RO_SPACE", 0x01959): (213, "SideEffectFreeCallHandlerInfoMap"),
+  ("RO_SPACE", 0x019a9): (213, "NextCallSideEffectFreeCallHandlerInfoMap"),
+  ("RO_SPACE", 0x019f9): (196, "SimpleNumberDictionaryMap"),
+  ("RO_SPACE", 0x01a49): (187, "SloppyArgumentsElementsMap"),
+  ("RO_SPACE", 0x01a99): (224, "SmallOrderedHashMapMap"),
+  ("RO_SPACE", 0x01ae9): (225, "SmallOrderedHashSetMap"),
+  ("RO_SPACE", 0x01b39): (226, "SmallOrderedNameDictionaryMap"),
+  ("RO_SPACE", 0x01b89): (197, "StringTableMap"),
+  ("RO_SPACE", 0x01bd9): (228, "UncompiledDataWithoutPreparseDataMap"),
+  ("RO_SPACE", 0x01c29): (229, "UncompiledDataWithPreparseDataMap"),
+  ("RO_SPACE", 0x01c79): (230, "WeakArrayListMap"),
+  ("RO_SPACE", 0x01cc9): (198, "EphemeronHashTableMap"),
+  ("RO_SPACE", 0x01d19): (186, "EmbedderDataArrayMap"),
+  ("RO_SPACE", 0x01d69): (231, "WeakCellMap"),
   ("RO_SPACE", 0x01db9): (106, "NativeSourceStringMap"),
   ("RO_SPACE", 0x01e09): (64, "StringMap"),
   ("RO_SPACE", 0x01e59): (73, "ConsOneByteStringMap"),
@@ -306,9 +305,9 @@ KNOWN_MAPS = {
   ("RO_SPACE", 0x02719): (149, "FixedBigUint64ArrayMap"),
   ("RO_SPACE", 0x02769): (148, "FixedBigInt64ArrayMap"),
   ("RO_SPACE", 0x027b9): (131, "SelfReferenceMarkerMap"),
-  ("RO_SPACE", 0x02821): (174, "Tuple2Map"),
-  ("RO_SPACE", 0x028c1): (176, "ArrayBoilerplateDescriptionMap"),
-  ("RO_SPACE", 0x02c01): (164, "InterceptorInfoMap"),
+  ("RO_SPACE", 0x02821): (173, "Tuple2Map"),
+  ("RO_SPACE", 0x028c1): (175, "ArrayBoilerplateDescriptionMap"),
+  ("RO_SPACE", 0x02c01): (163, "InterceptorInfoMap"),
   ("RO_SPACE", 0x05109): (153, "AccessCheckInfoMap"),
   ("RO_SPACE", 0x05159): (154, "AccessorInfoMap"),
   ("RO_SPACE", 0x051a9): (155, "AccessorPairMap"),
@@ -316,38 +315,37 @@ KNOWN_MAPS = {
   ("RO_SPACE", 0x05249): (157, "AllocationMementoMap"),
   ("RO_SPACE", 0x05299): (158, "AsmWasmDataMap"),
   ("RO_SPACE", 0x052e9): (159, "AsyncGeneratorRequestMap"),
-  ("RO_SPACE", 0x05339): (160, "ClassPositionsMap"),
-  ("RO_SPACE", 0x05389): (161, "DebugInfoMap"),
-  ("RO_SPACE", 0x053d9): (162, "FunctionTemplateInfoMap"),
-  ("RO_SPACE", 0x05429): (163, "FunctionTemplateRareDataMap"),
-  ("RO_SPACE", 0x05479): (165, "InterpreterDataMap"),
-  ("RO_SPACE", 0x054c9): (166, "ModuleInfoEntryMap"),
-  ("RO_SPACE", 0x05519): (167, "ModuleMap"),
-  ("RO_SPACE", 0x05569): (168, "ObjectTemplateInfoMap"),
-  ("RO_SPACE", 0x055b9): (169, "PromiseCapabilityMap"),
-  ("RO_SPACE", 0x05609): (170, "PromiseReactionMap"),
-  ("RO_SPACE", 0x05659): (171, "PrototypeInfoMap"),
-  ("RO_SPACE", 0x056a9): (172, "ScriptMap"),
-  ("RO_SPACE", 0x056f9): (173, "StackFrameInfoMap"),
-  ("RO_SPACE", 0x05749): (175, "Tuple3Map"),
-  ("RO_SPACE", 0x05799): (177, "WasmDebugInfoMap"),
-  ("RO_SPACE", 0x057e9): (178, "WasmExceptionTagMap"),
-  ("RO_SPACE", 0x05839): (179, "WasmExportedFunctionDataMap"),
-  ("RO_SPACE", 0x05889): (180, "CallableTaskMap"),
-  ("RO_SPACE", 0x058d9): (181, "CallbackTaskMap"),
-  ("RO_SPACE", 0x05929): (182, "PromiseFulfillReactionJobTaskMap"),
-  ("RO_SPACE", 0x05979): (183, "PromiseRejectReactionJobTaskMap"),
-  ("RO_SPACE", 0x059c9): (184, "PromiseResolveThenableJobTaskMap"),
-  ("RO_SPACE", 0x05a19): (185, "FinalizationGroupCleanupJobTaskMap"),
-  ("RO_SPACE", 0x05a69): (186, "AllocationSiteWithWeakNextMap"),
-  ("RO_SPACE", 0x05ab9): (186, "AllocationSiteWithoutWeakNextMap"),
-  ("RO_SPACE", 0x05b09): (220, "LoadHandler1Map"),
-  ("RO_SPACE", 0x05b59): (220, "LoadHandler2Map"),
-  ("RO_SPACE", 0x05ba9): (220, "LoadHandler3Map"),
-  ("RO_SPACE", 0x05bf9): (228, "StoreHandler0Map"),
-  ("RO_SPACE", 0x05c49): (228, "StoreHandler1Map"),
-  ("RO_SPACE", 0x05c99): (228, "StoreHandler2Map"),
-  ("RO_SPACE", 0x05ce9): (228, "StoreHandler3Map"),
+  ("RO_SPACE", 0x05339): (160, "DebugInfoMap"),
+  ("RO_SPACE", 0x05389): (161, "FunctionTemplateInfoMap"),
+  ("RO_SPACE", 0x053d9): (162, "FunctionTemplateRareDataMap"),
+  ("RO_SPACE", 0x05429): (164, "InterpreterDataMap"),
+  ("RO_SPACE", 0x05479): (165, "ModuleInfoEntryMap"),
+  ("RO_SPACE", 0x054c9): (166, "ModuleMap"),
+  ("RO_SPACE", 0x05519): (167, "ObjectTemplateInfoMap"),
+  ("RO_SPACE", 0x05569): (168, "PromiseCapabilityMap"),
+  ("RO_SPACE", 0x055b9): (169, "PromiseReactionMap"),
+  ("RO_SPACE", 0x05609): (170, "PrototypeInfoMap"),
+  ("RO_SPACE", 0x05659): (171, "ScriptMap"),
+  ("RO_SPACE", 0x056a9): (172, "StackFrameInfoMap"),
+  ("RO_SPACE", 0x056f9): (174, "Tuple3Map"),
+  ("RO_SPACE", 0x05749): (176, "WasmDebugInfoMap"),
+  ("RO_SPACE", 0x05799): (177, "WasmExceptionTagMap"),
+  ("RO_SPACE", 0x057e9): (178, "WasmExportedFunctionDataMap"),
+  ("RO_SPACE", 0x05839): (179, "CallableTaskMap"),
+  ("RO_SPACE", 0x05889): (180, "CallbackTaskMap"),
+  ("RO_SPACE", 0x058d9): (181, "PromiseFulfillReactionJobTaskMap"),
+  ("RO_SPACE", 0x05929): (182, "PromiseRejectReactionJobTaskMap"),
+  ("RO_SPACE", 0x05979): (183, "PromiseResolveThenableJobTaskMap"),
+  ("RO_SPACE", 0x059c9): (184, "FinalizationGroupCleanupJobTaskMap"),
+  ("RO_SPACE", 0x05a19): (185, "AllocationSiteWithWeakNextMap"),
+  ("RO_SPACE", 0x05a69): (185, "AllocationSiteWithoutWeakNextMap"),
+  ("RO_SPACE", 0x05ab9): (219, "LoadHandler1Map"),
+  ("RO_SPACE", 0x05b09): (219, "LoadHandler2Map"),
+  ("RO_SPACE", 0x05b59): (219, "LoadHandler3Map"),
+  ("RO_SPACE", 0x05ba9): (227, "StoreHandler0Map"),
+  ("RO_SPACE", 0x05bf9): (227, "StoreHandler1Map"),
+  ("RO_SPACE", 0x05c49): (227, "StoreHandler2Map"),
+  ("RO_SPACE", 0x05c99): (227, "StoreHandler3Map"),
   ("MAP_SPACE", 0x00139): (1057, "ExternalMap"),
   ("MAP_SPACE", 0x00189): (1073, "JSMessageObjectMap"),
 }