1 files changed, 11 insertions, 9 deletions
diff --git a/deps/v8/test/mkgrokdump/mkgrokdump.cc b/deps/v8/test/mkgrokdump/mkgrokdump.cc
index f539889b9f..63f6e3b3ea 100644
--- a/deps/v8/test/mkgrokdump/mkgrokdump.cc
+++ b/deps/v8/test/mkgrokdump/mkgrokdump.cc
@@ -26,7 +26,8 @@ static const char* kHeader =
     "# This file is automatically generated by mkgrokdump and should not\n"
     "# be modified manually.\n"
     "\n"
-    "# List of known V8 instance types.\n";
+    "# List of known V8 instance types.\n"
+    "# yapf: disable\n\n";
 
 // Debug builds emit debug code, affecting code object sizes.
 #ifndef DEBUG
@@ -59,8 +60,8 @@ static void DumpKnownMap(FILE* out, i::Heap* heap, const char* space_name,
   MUTABLE_ROOT_LIST(MUTABLE_ROOT_LIST_CASE)
 
   if (root_name == nullptr) return;
-  i::PrintF(out, "  (\"%s\", 0x%05" V8PRIxPTR "): (%d, \"%s\"),\n", space_name,
-            root_ptr, map.instance_type(), root_name);
+  i::PrintF(out, "    (\"%s\", 0x%05" V8PRIxPTR "): (%d, \"%s\"),\n",
+            space_name, root_ptr, map.instance_type(), root_name);
 
 #undef MUTABLE_ROOT_LIST_CASE
 #undef RO_ROOT_LIST_CASE
@@ -115,9 +116,9 @@ static int DumpHeapConstants(FILE* out, const char* argv0) {
   // Start up V8.
   std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
   v8::V8::InitializePlatform(platform.get());
-#ifdef V8_VIRTUAL_MEMORY_CAGE
-  if (!v8::V8::InitializeVirtualMemoryCage()) {
-    FATAL("Could not initialize the virtual memory cage");
+#ifdef V8_SANDBOX
+  if (!v8::V8::InitializeSandbox()) {
+    FATAL("Could not initialize the sandbox");
   }
 #endif
   v8::V8::Initialize();
@@ -150,12 +151,13 @@ static int DumpHeapConstants(FILE* out, const char* argv0) {
         DumpKnownMap(out, heap, i::BaseSpace::GetSpaceName(i::RO_SPACE),
                      object);
       }
-      i::PagedSpaceObjectIterator iterator(heap, heap->map_space());
+
+      i::PagedSpace* space_for_maps = heap->space_for_maps();
+      i::PagedSpaceObjectIterator iterator(heap, space_for_maps);
       for (i::HeapObject object = iterator.Next(); !object.is_null();
            object = iterator.Next()) {
         if (!object.IsMap()) continue;
-        DumpKnownMap(out, heap, i::BaseSpace::GetSpaceName(i::MAP_SPACE),
-                     object);
+        DumpKnownMap(out, heap, space_for_maps->name(), object);
       }
       i::PrintF(out, "}\n");
     }