Skip to content

Commit 1bb880b

Browse files
addaleaxjasnell
authored andcommitted
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>
1 parent 04e646b commit 1bb880b

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

deps/v8/include/v8.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8451,8 +8451,8 @@ class Internals {
84518451
static const int kNodeIsIndependentShift = 3;
84528452
static const int kNodeIsActiveShift = 4;
84538453

8454-
static const int kJSApiObjectType = 0xb9;
8455-
static const int kJSObjectType = 0xba;
8454+
static const int kJSApiObjectType = 0xbb;
8455+
static const int kJSObjectType = 0xbc;
84568456
static const int kFirstNonstringType = 0x80;
84578457
static const int kOddballType = 0x82;
84588458
static const int kForeignType = 0x86;

deps/v8/src/objects.h

+4
Original file line numberDiff line numberDiff line change
@@ -357,13 +357,15 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1;
357357
V(PROMISE_REACTION_JOB_INFO_TYPE) \
358358
V(DEBUG_INFO_TYPE) \
359359
V(BREAK_POINT_INFO_TYPE) \
360+
V(STACK_FRAME_INFO_TYPE) \
360361
V(PROTOTYPE_INFO_TYPE) \
361362
V(TUPLE2_TYPE) \
362363
V(TUPLE3_TYPE) \
363364
V(CONTEXT_EXTENSION_TYPE) \
364365
V(CONSTANT_ELEMENTS_PAIR_TYPE) \
365366
V(MODULE_TYPE) \
366367
V(MODULE_INFO_ENTRY_TYPE) \
368+
V(ASYNC_GENERATOR_REQUEST_TYPE) \
367369
V(FIXED_ARRAY_TYPE) \
368370
V(TRANSITION_ARRAY_TYPE) \
369371
V(SHARED_FUNCTION_INFO_TYPE) \
@@ -696,13 +698,15 @@ enum InstanceType {
696698
PROMISE_REACTION_JOB_INFO_TYPE,
697699
DEBUG_INFO_TYPE,
698700
BREAK_POINT_INFO_TYPE,
701+
STACK_FRAME_INFO_TYPE,
699702
PROTOTYPE_INFO_TYPE,
700703
TUPLE2_TYPE,
701704
TUPLE3_TYPE,
702705
CONTEXT_EXTENSION_TYPE,
703706
CONSTANT_ELEMENTS_PAIR_TYPE,
704707
MODULE_TYPE,
705708
MODULE_INFO_ENTRY_TYPE,
709+
ASYNC_GENERATOR_REQUEST_TYPE,
706710
FIXED_ARRAY_TYPE,
707711
TRANSITION_ARRAY_TYPE,
708712
SHARED_FUNCTION_INFO_TYPE,

deps/v8/test/unittests/object-unittest.cc

+9-7
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ TEST(Object, StructListOrder) {
4040
int last = current - 1;
4141
ASSERT_LT(0, last);
4242
InstanceType current_type = static_cast<InstanceType>(current);
43-
#define TEST_STRUCT(type, class, name) \
44-
current_type = InstanceType::type##_TYPE; \
45-
current = static_cast<int>(current_type); \
46-
EXPECT_EQ(last + 1, current) \
47-
<< " STRUCT_LIST is not ordered: " \
48-
<< " last = " << static_cast<InstanceType>(last) \
49-
<< " vs. current = " << current_type; \
43+
#define TEST_STRUCT(type, class, name) \
44+
current_type = InstanceType::type##_TYPE; \
45+
current = static_cast<int>(current_type); \
46+
if (current_type != InstanceType::PROTOTYPE_INFO_TYPE) { \
47+
EXPECT_EQ(last + 1, current) \
48+
<< " STRUCT_LIST is not ordered: " \
49+
<< " last = " << static_cast<InstanceType>(last) \
50+
<< " vs. current = " << current_type; \
51+
} \
5052
last = current;
5153

5254
STRUCT_LIST(TEST_STRUCT)

0 commit comments

Comments
 (0)