Re-land rev. 12849 and 12868 (Heavy cleanup of the external pointer API + related fix).

tools/grokdump.py

Index: tools/grokdump.py
diff --git a/tools/grokdump.py b/tools/grokdump.py
index 46ead5e465559c27563812dfc5e032e8efa46eba..b51e4e0e7fef31298acebfbbedb0ac04a748b42a 100755
--- a/tools/grokdump.py
+++ b/tools/grokdump.py
@@ -863,80 +863,83 @@ INSTANCE_TYPES = {
 # }
 # printf("}\n");
 KNOWN_MAPS = {
-  0x08081: (134, "ByteArrayMap"),
-  0x080a1: (128, "MetaMap"),
-  0x080c1: (130, "OddballMap"),
-  0x080e1: (163, "FixedArrayMap"),
-  0x08101: (68, "AsciiSymbolMap"),
-  0x08121: (132, "HeapNumberMap"),
-  0x08141: (135, "FreeSpaceMap"),
-  0x08161: (146, "OnePointerFillerMap"),
-  0x08181: (146, "TwoPointerFillerMap"),
-  0x081a1: (131, "GlobalPropertyCellMap"),
-  0x081c1: (164, "SharedFunctionInfoMap"),
-  0x081e1: (4, "AsciiStringMap"),
-  0x08201: (163, "GlobalContextMap"),
-  0x08221: (129, "CodeMap"),
-  0x08241: (163, "ScopeInfoMap"),
-  0x08261: (163, "FixedCOWArrayMap"),
-  0x08281: (145, "FixedDoubleArrayMap"),
-  0x082a1: (163, "HashTableMap"),
-  0x082c1: (0, "StringMap"),
-  0x082e1: (64, "SymbolMap"),
-  0x08301: (1, "ConsStringMap"),
-  0x08321: (5, "ConsAsciiStringMap"),
-  0x08341: (3, "SlicedStringMap"),
-  0x08361: (7, "SlicedAsciiStringMap"),
-  0x08381: (65, "ConsSymbolMap"),
-  0x083a1: (69, "ConsAsciiSymbolMap"),
-  0x083c1: (66, "ExternalSymbolMap"),
-  0x083e1: (74, "ExternalSymbolWithAsciiDataMap"),
-  0x08401: (70, "ExternalAsciiSymbolMap"),
-  0x08421: (2, "ExternalStringMap"),
-  0x08441: (10, "ExternalStringWithAsciiDataMap"),
-  0x08461: (6, "ExternalAsciiStringMap"),
-  0x08481: (82, "ShortExternalSymbolMap"),
-  0x084a1: (90, "ShortExternalSymbolWithAsciiDataMap"),
-  0x084c1: (86, "ShortExternalAsciiSymbolMap"),
-  0x084e1: (18, "ShortExternalStringMap"),
-  0x08501: (26, "ShortExternalStringWithAsciiDataMap"),
-  0x08521: (22, "ShortExternalAsciiStringMap"),
-  0x08541: (0, "UndetectableStringMap"),
-  0x08561: (4, "UndetectableAsciiStringMap"),
-  0x08581: (144, "ExternalPixelArrayMap"),
-  0x085a1: (136, "ExternalByteArrayMap"),
-  0x085c1: (137, "ExternalUnsignedByteArrayMap"),
-  0x085e1: (138, "ExternalShortArrayMap"),
-  0x08601: (139, "ExternalUnsignedShortArrayMap"),
-  0x08621: (140, "ExternalIntArrayMap"),
-  0x08641: (141, "ExternalUnsignedIntArrayMap"),
-  0x08661: (142, "ExternalFloatArrayMap"),
-  0x08681: (143, "ExternalDoubleArrayMap"),
-  0x086a1: (163, "NonStrictArgumentsElementsMap"),
-  0x086c1: (163, "FunctionContextMap"),
-  0x086e1: (163, "CatchContextMap"),
-  0x08701: (163, "WithContextMap"),
-  0x08721: (163, "BlockContextMap"),
-  0x08741: (163, "ModuleContextMap"),
-  0x08761: (165, "JSMessageObjectMap"),
-  0x08781: (133, "ForeignMap"),
-  0x087a1: (170, "NeanderMap"),
-  0x087c1: (158, "PolymorphicCodeCacheMap"),
-  0x087e1: (156, "ScriptMap"),
-  0x08801: (147, "AccessorInfoMap"),
-  0x08821: (148, "AccessorPairMap"),
-  0x08841: (149, "AccessCheckInfoMap"),
-  0x08861: (150, "InterceptorInfoMap"),
-  0x08881: (151, "CallHandlerInfoMap"),
-  0x088a1: (152, "FunctionTemplateInfoMap"),
-  0x088c1: (153, "ObjectTemplateInfoMap"),
-  0x088e1: (154, "SignatureInfoMap"),
-  0x08901: (155, "TypeSwitchInfoMap"),
-  0x08921: (157, "CodeCacheMap"),
-  0x08941: (159, "TypeFeedbackInfoMap"),
-  0x08961: (160, "AliasedArgumentsEntryMap"),
-  0x08981: (161, "DebugInfoMap"),
-  0x089a1: (162, "BreakPointInfoMap"),
+  0x08081: (128, "MetaMap"),
+  0x080a5: (163, "FixedArrayMap"),
+  0x080c9: (130, "OddballMap"),
+  0x080ed: (163, "FixedCOWArrayMap"),
+  0x08111: (163, "ScopeInfoMap"),
+  0x08135: (132, "HeapNumberMap"),
+  0x08159: (133, "ForeignMap"),
+  0x0817d: (64, "SymbolMap"),
+  0x081a1: (68, "AsciiSymbolMap"),
+  0x081c5: (65, "ConsSymbolMap"),
+  0x081e9: (69, "ConsAsciiSymbolMap"),
+  0x0820d: (66, "ExternalSymbolMap"),
+  0x08231: (74, "ExternalSymbolWithAsciiDataMap"),
+  0x08255: (70, "ExternalAsciiSymbolMap"),
+  0x08279: (82, "ShortExternalSymbolMap"),
+  0x0829d: (90, "ShortExternalSymbolWithAsciiDataMap"),
+  0x082c1: (86, "ShortExternalAsciiSymbolMap"),
+  0x082e5: (0, "StringMap"),
+  0x08309: (4, "AsciiStringMap"),
+  0x0832d: (1, "ConsStringMap"),
+  0x08351: (5, "ConsAsciiStringMap"),
+  0x08375: (3, "SlicedStringMap"),
+  0x08399: (7, "SlicedAsciiStringMap"),
+  0x083bd: (2, "ExternalStringMap"),
+  0x083e1: (10, "ExternalStringWithAsciiDataMap"),
+  0x08405: (6, "ExternalAsciiStringMap"),
+  0x08429: (18, "ShortExternalStringMap"),
+  0x0844d: (26, "ShortExternalStringWithAsciiDataMap"),
+  0x08471: (22, "ShortExternalAsciiStringMap"),
+  0x08495: (0, "UndetectableStringMap"),
+  0x084b9: (4, "UndetectableAsciiStringMap"),
+  0x084dd: (145, "FixedDoubleArrayMap"),
+  0x08501: (134, "ByteArrayMap"),
+  0x08525: (135, "FreeSpaceMap"),
+  0x08549: (144, "ExternalPixelArrayMap"),
+  0x0856d: (136, "ExternalByteArrayMap"),
+  0x08591: (137, "ExternalUnsignedByteArrayMap"),
+  0x085b5: (138, "ExternalShortArrayMap"),
+  0x085d9: (139, "ExternalUnsignedShortArrayMap"),
+  0x085fd: (140, "ExternalIntArrayMap"),
+  0x08621: (141, "ExternalUnsignedIntArrayMap"),
+  0x08645: (142, "ExternalFloatArrayMap"),
+  0x08669: (163, "NonStrictArgumentsElementsMap"),
+  0x0868d: (143, "ExternalDoubleArrayMap"),
+  0x086b1: (129, "CodeMap"),
+  0x086d5: (131, "GlobalPropertyCellMap"),
+  0x086f9: (146, "OnePointerFillerMap"),
+  0x0871d: (146, "TwoPointerFillerMap"),
+  0x08741: (147, "AccessorInfoMap"),
+  0x08765: (148, "AccessorPairMap"),
+  0x08789: (149, "AccessCheckInfoMap"),
+  0x087ad: (150, "InterceptorInfoMap"),
+  0x087d1: (151, "CallHandlerInfoMap"),
+  0x087f5: (152, "FunctionTemplateInfoMap"),
+  0x08819: (153, "ObjectTemplateInfoMap"),
+  0x0883d: (154, "SignatureInfoMap"),
+  0x08861: (155, "TypeSwitchInfoMap"),
+  0x08885: (156, "ScriptMap"),
+  0x088a9: (157, "CodeCacheMap"),
+  0x088cd: (158, "PolymorphicCodeCacheMap"),
+  0x088f1: (159, "TypeFeedbackInfoMap"),
+  0x08915: (160, "AliasedArgumentsEntryMap"),
+  0x08939: (161, "DebugInfoMap"),
+  0x0895d: (162, "BreakPointInfoMap"),
+  0x08981: (163, "HashTableMap"),
+  0x089a5: (163, "FunctionContextMap"),
+  0x089c9: (163, "CatchContextMap"),
+  0x089ed: (163, "WithContextMap"),
+  0x08a11: (163, "BlockContextMap"),
+  0x08a35: (163, "ModuleContextMap"),
+  0x08a59: (163, "GlobalContextMap"),
+  0x08a7d: (163, "NativeContextMap"),
+  0x08aa1: (164, "SharedFunctionInfoMap"),
+  0x08ac5: (165, "JSMessageObjectMap"),
+  0x08ae9: (170, "ExternalMap"),
+  0x08b0d: (170, "NeanderMap"),
+  0x08b31: (170, ""),
 }