deps: update V8 to 6.5.254.31

PR-URL: https://github.com/nodejs/node/pull/18453
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

2 files changed, 34 insertions, 35 deletions

diff --git a/deps/v8/test/mkgrokdump/mkgrokdump.cc b/deps/v8/test/mkgrokdump/mkgrokdump.cc
index 264779601b..75dac7a4a4 100644
--- a/deps/v8/test/mkgrokdump/mkgrokdump.cc
+++ b/deps/v8/test/mkgrokdump/mkgrokdump.cc
@@ -75,7 +75,7 @@ static int DumpHeapConstants(const char* argv0) {
     for (i::Object* o = it.Next(); o != NULL; o = it.Next()) {
       i::Map* m = i::Map::cast(o);
       const char* n = NULL;
-      intptr_t p = reinterpret_cast<intptr_t>(m) & 0x7ffff;
+      intptr_t p = reinterpret_cast<intptr_t>(m) & 0x7FFFF;
       int t = m->instance_type();
       ROOT_LIST(ROOT_LIST_CASE)
       STRUCT_LIST(STRUCT_LIST_CASE)
@@ -93,17 +93,18 @@ static int DumpHeapConstants(const char* argv0) {
     n = #camel_name;                           \
     i = i::Heap::k##camel_name##RootIndex;     \
   }
-    i::OldSpaces spit(heap);
+    i::PagedSpaces spit(heap);
     i::PrintF("KNOWN_OBJECTS = {\n");
     for (i::PagedSpace* s = spit.next(); s != NULL; s = spit.next()) {
       i::HeapObjectIterator it(s);
       // Code objects are generally platform-dependent.
-      if (s->identity() == i::CODE_SPACE) continue;
+      if (s->identity() == i::CODE_SPACE || s->identity() == i::MAP_SPACE)
+        continue;
       const char* sname = AllocationSpaceName(s->identity());
       for (i::Object* o = it.Next(); o != NULL; o = it.Next()) {
         const char* n = NULL;
         i::Heap::RootListIndex i = i::Heap::kStrongRootListLength;
-        intptr_t p = reinterpret_cast<intptr_t>(o) & 0x7ffff;
+        intptr_t p = reinterpret_cast<intptr_t>(o) & 0x7FFFF;
         ROOT_LIST(ROOT_LIST_CASE)
         if (n == NULL) continue;
         if (!i::Heap::RootIsImmortalImmovable(i)) continue;
diff --git a/deps/v8/test/mkgrokdump/testcfg.py b/deps/v8/test/mkgrokdump/testcfg.py
index 3dcf80a6a1..de8e71f7ea 100644
--- a/deps/v8/test/mkgrokdump/testcfg.py
+++ b/deps/v8/test/mkgrokdump/testcfg.py
@@ -3,48 +3,46 @@
 # found in the LICENSE file.
 
 import os
-import difflib
 
 from testrunner.local import testsuite
 from testrunner.objects import testcase
+from testrunner.outproc import mkgrokdump
 
 
-class MkGrokdump(testsuite.TestSuite):
-  SHELL = 'mkgrokdump'
+SHELL = 'mkgrokdump'
 
-  def __init__(self, name, root):
-    super(MkGrokdump, self).__init__(name, root)
+class TestSuite(testsuite.TestSuite):
+  def __init__(self, *args, **kwargs):
+    super(TestSuite, self).__init__(*args, **kwargs)
+
+    v8_path = os.path.dirname(os.path.dirname(os.path.abspath(self.root)))
+    self.expected_path = os.path.join(v8_path, 'tools', 'v8heapconst.py')
 
   def ListTests(self, context):
-    test = testcase.TestCase(self, self.SHELL)
+    test = self._create_test(SHELL)
     return [test]
 
-  def GetShellForTestCase(self, testcase):
-    return self.SHELL
+  def _test_class(self):
+    return TestCase
 
-  def GetParametersForTestCase(self, testcase, context):
-    return [], [], {}
 
-  def IsFailureOutput(self, testcase):
-    output = testcase.output
-    v8_path = os.path.dirname(os.path.dirname(os.path.abspath(self.root)))
-    expected_path = os.path.join(v8_path, "tools", "v8heapconst.py")
-    with open(expected_path) as f:
-      expected = f.read()
-    expected_lines = expected.splitlines()
-    actual_lines = output.stdout.splitlines()
-    diff = difflib.unified_diff(expected_lines, actual_lines, lineterm="",
-                                fromfile="expected_path")
-    diffstring = '\n'.join(diff)
-    if diffstring is not "":
-      if "generated from a non-shipping build" in output.stdout:
-        return False
-      if not "generated from a shipping build" in output.stdout:
-        output.stdout = "Unexpected output:\n\n" + output.stdout
-        return True
-      output.stdout = diffstring
-      return True
-    return False
+class TestCase(testcase.TestCase):
+  def _get_variant_flags(self):
+    return []
+
+  def _get_statusfile_flags(self):
+    return []
+
+  def _get_mode_flags(self, ctx):
+    return []
+
+  def get_shell(self):
+    return SHELL
+
+  @property
+  def output_proc(self):
+    return mkgrokdump.OutProc(self.expected_outcomes, self.suite.expected_path)
+
 
 def GetSuite(name, root):
-  return MkGrokdump(name, root)
+  return TestSuite(name, root)