v8: backport pieces of bf463c4dc0 and dc662e5b74

Backport ABI-incompatible changes from bf463c4dc080 (“[async-iteration] implement AsyncGenerator”) and dc662e5b740c (“[inspector] move console to builtins”). This also requires relaxing one of the V8 unit tests. Ref: https://chromium-review.googlesource.com/446961 Ref: v8/v8@bf463c4dc080 Ref: https://codereview.chromium.org/2785293002 Ref: v8/v8@dc662e5b740c PR-URL: #12875 Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · May 28, 2017 · 1bb880b · 1bb880b
1 parent 04e646b
commit 1bb880b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h
@@ -8451,8 +8451,8 @@ class Internals {
   static const int kNodeIsIndependentShift = 3;
   static const int kNodeIsActiveShift = 4;
 
-  static const int kJSApiObjectType = 0xb9;
-  static const int kJSObjectType = 0xba;
+  static const int kJSApiObjectType = 0xbb;
+  static const int kJSObjectType = 0xbc;
   static const int kFirstNonstringType = 0x80;
   static const int kOddballType = 0x82;
   static const int kForeignType = 0x86;

diff --git a/deps/v8/src/objects.h b/deps/v8/src/objects.h
@@ -357,13 +357,15 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1;
   V(PROMISE_REACTION_JOB_INFO_TYPE)                             \
   V(DEBUG_INFO_TYPE)                                            \
   V(BREAK_POINT_INFO_TYPE)                                      \
+  V(STACK_FRAME_INFO_TYPE)                                      \
   V(PROTOTYPE_INFO_TYPE)                                        \
   V(TUPLE2_TYPE)                                                \
   V(TUPLE3_TYPE)                                                \
   V(CONTEXT_EXTENSION_TYPE)                                     \
   V(CONSTANT_ELEMENTS_PAIR_TYPE)                                \
   V(MODULE_TYPE)                                                \
   V(MODULE_INFO_ENTRY_TYPE)                                     \
+  V(ASYNC_GENERATOR_REQUEST_TYPE)                               \
   V(FIXED_ARRAY_TYPE)                                           \
   V(TRANSITION_ARRAY_TYPE)                                      \
   V(SHARED_FUNCTION_INFO_TYPE)                                  \
@@ -696,13 +698,15 @@ enum InstanceType {
   PROMISE_REACTION_JOB_INFO_TYPE,
   DEBUG_INFO_TYPE,
   BREAK_POINT_INFO_TYPE,
+  STACK_FRAME_INFO_TYPE,
   PROTOTYPE_INFO_TYPE,
   TUPLE2_TYPE,
   TUPLE3_TYPE,
   CONTEXT_EXTENSION_TYPE,
   CONSTANT_ELEMENTS_PAIR_TYPE,
   MODULE_TYPE,
   MODULE_INFO_ENTRY_TYPE,
+  ASYNC_GENERATOR_REQUEST_TYPE,
   FIXED_ARRAY_TYPE,
   TRANSITION_ARRAY_TYPE,
   SHARED_FUNCTION_INFO_TYPE,

diff --git a/deps/v8/test/unittests/object-unittest.cc b/deps/v8/test/unittests/object-unittest.cc
@@ -40,13 +40,15 @@ TEST(Object, StructListOrder) {
   int last = current - 1;
   ASSERT_LT(0, last);
   InstanceType current_type = static_cast<InstanceType>(current);
-#define TEST_STRUCT(type, class, name)                 \
-  current_type = InstanceType::type##_TYPE;            \
-  current = static_cast<int>(current_type);            \
-  EXPECT_EQ(last + 1, current)                         \
-      << " STRUCT_LIST is not ordered: "               \
-      << " last = " << static_cast<InstanceType>(last) \
-      << " vs. current = " << current_type;            \
+#define TEST_STRUCT(type, class, name)                     \
+  current_type = InstanceType::type##_TYPE;                \
+  current = static_cast<int>(current_type);                \
+  if (current_type != InstanceType::PROTOTYPE_INFO_TYPE) { \
+    EXPECT_EQ(last + 1, current)                           \
+        << " STRUCT_LIST is not ordered: "                 \
+        << " last = " << static_cast<InstanceType>(last)   \
+        << " vs. current = " << current_type;              \
+  }                                                        \
   last = current;
 
   STRUCT_LIST(TEST_STRUCT)