Skip to content

Commit a244992

Browse files
committed
deps: V8: cherry-pick 0cc9eb22c0b0
Original commit message: [api] Remove PromiseResolveAfterResolved and PromiseRejectAfterResolved These were previously deprecated in https://crrev.com/c/7774767 Bug: 42213031 Change-Id: I07b802b743bf052611f30a61c1132231df22f0bd Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7897881 Commit-Queue: Olivier Flückiger <olivf@chromium.org> Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Olivier Flückiger <olivf@chromium.org> Cr-Commit-Position: refs/heads/main@{#108040} Refs: v8/v8@0cc9eb2
1 parent f8af88a commit a244992

8 files changed

Lines changed: 9 additions & 66 deletions

File tree

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
# Reset this number to 0 on major V8 upgrades.
4242
# Increment by one for each non-official patch applied to deps/v8.
43-
'v8_embedder_string': '-node.22',
43+
'v8_embedder_string': '-node.23',
4444

4545
##### V8 defaults for Node.js #####
4646

deps/v8/include/v8-promise.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,8 @@ using PromiseHook = void (*)(PromiseHookType type, Local<Promise> promise,
158158
enum PromiseRejectEvent {
159159
kPromiseRejectWithNoHandler = 0,
160160
kPromiseHandlerAddedAfterReject = 1,
161-
kPromiseRejectAfterResolved V8_DEPRECATED("These events are being removed") =
162-
2,
163-
kPromiseResolveAfterResolved V8_DEPRECATED("These events are being removed") =
164-
3,
161+
kDeprecatedPromiseRejectAfterResolved V8_DEPRECATED("Removed event") = 2,
162+
kDeprecatedPromiseResolveAfterResolved V8_DEPRECATED("Removed event") = 3,
165163
};
166164

167165
class PromiseRejectMessage {

deps/v8/src/builtins/promise-abstract-operations.tq

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ extern transitioning runtime RejectPromise(
1212
extern transitioning runtime PromiseRevokeReject(
1313
implicit context: Context)(JSPromise): JSAny;
1414

15-
extern transitioning runtime PromiseRejectAfterResolved(
16-
implicit context: Context)(JSPromise, JSAny): JSAny;
17-
18-
extern transitioning runtime PromiseResolveAfterResolved(
19-
implicit context: Context)(JSPromise, JSAny): JSAny;
20-
2115
extern transitioning runtime PromiseRejectEventFromStack(
2216
implicit context: Context)(JSPromise, JSAny): JSAny;
2317
}
@@ -406,7 +400,7 @@ transitioning javascript builtin PromiseCapabilityDefaultReject(
406400

407401
// 4. If alreadyResolved.[[Value]] is true, return undefined.
408402
if (alreadyResolved == True) {
409-
return runtime::PromiseRejectAfterResolved(promise, reason);
403+
return Undefined;
410404
}
411405

412406
// 5. Set alreadyResolved.[[Value]] to true.
@@ -434,7 +428,7 @@ transitioning javascript builtin PromiseCapabilityDefaultResolve(
434428

435429
// 4. If alreadyResolved.[[Value]] is true, return undefined.
436430
if (alreadyResolved == True) {
437-
return runtime::PromiseResolveAfterResolved(promise, resolution);
431+
return Undefined;
438432
}
439433

440434
// 5. Set alreadyResolved.[[Value]] to true.

deps/v8/src/d8/d8.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4575,13 +4575,6 @@ static void PrintMessageCallback(Local<Message> message, Local<Value> error) {
45754575

45764576
void Shell::PromiseRejectCallback(v8::PromiseRejectMessage data) {
45774577
if (options.ignore_unhandled_promises) return;
4578-
START_ALLOW_USE_DEPRECATED();
4579-
if (data.GetEvent() == v8::kPromiseRejectAfterResolved ||
4580-
data.GetEvent() == v8::kPromiseResolveAfterResolved) {
4581-
// Ignore reject/resolve after resolved.
4582-
return;
4583-
}
4584-
END_ALLOW_USE_DEPRECATED();
45854578
v8::Local<v8::Promise> promise = data.GetPromise();
45864579
v8::Isolate* isolate = v8::Isolate::GetCurrent();
45874580
PerIsolateData* isolate_data = PerIsolateData::Get(isolate);

deps/v8/src/runtime/runtime-promise.cc

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,6 @@ RUNTIME_FUNCTION(Runtime_PromiseRejectEventFromStack) {
2929
return ReadOnlyRoots(isolate).undefined_value();
3030
}
3131

32-
RUNTIME_FUNCTION(Runtime_PromiseRejectAfterResolved) {
33-
DCHECK_EQ(2, args.length());
34-
HandleScope scope(isolate);
35-
DirectHandle<JSPromise> promise = args.at<JSPromise>(0);
36-
DirectHandle<Object> reason = args.at(1);
37-
START_ALLOW_USE_DEPRECATED();
38-
isolate->ReportPromiseReject(promise, reason,
39-
v8::kPromiseRejectAfterResolved);
40-
END_ALLOW_USE_DEPRECATED();
41-
return ReadOnlyRoots(isolate).undefined_value();
42-
}
43-
44-
RUNTIME_FUNCTION(Runtime_PromiseResolveAfterResolved) {
45-
DCHECK_EQ(2, args.length());
46-
HandleScope scope(isolate);
47-
DirectHandle<JSPromise> promise = args.at<JSPromise>(0);
48-
DirectHandle<Object> resolution = args.at(1);
49-
START_ALLOW_USE_DEPRECATED();
50-
isolate->ReportPromiseReject(promise, resolution,
51-
v8::kPromiseResolveAfterResolved);
52-
END_ALLOW_USE_DEPRECATED();
53-
return ReadOnlyRoots(isolate).undefined_value();
54-
}
55-
5632
RUNTIME_FUNCTION(Runtime_PromiseRevokeReject) {
5733
DCHECK_EQ(1, args.length());
5834
HandleScope scope(isolate);

deps/v8/src/runtime/runtime.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,6 @@ constexpr bool CanTriggerGC(T... properties) {
441441
F(PromiseRevokeReject, 1, 1) \
442442
F(RejectPromise, 3, 1) \
443443
F(ResolvePromise, 2, 1) \
444-
F(PromiseRejectAfterResolved, 2, 1) \
445-
F(PromiseResolveAfterResolved, 2, 1) \
446444
F(ConstructSuppressedError, 3, 1) \
447445
F(ConstructAggregateErrorHelper, 4, 1) \
448446
F(ConstructInternalAggregateErrorHelper, -1 /* <= 5*/, 1)

deps/v8/test/cctest/test-api.cc

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16381,8 +16381,6 @@ TEST(ErrorLevelWarning) {
1638116381
v8::PromiseRejectEvent reject_event = v8::kPromiseRejectWithNoHandler;
1638216382
int promise_reject_counter = 0;
1638316383
int promise_revoke_counter = 0;
16384-
int promise_reject_after_resolved_counter = 0;
16385-
int promise_resolve_after_resolved_counter = 0;
1638616384
int promise_reject_msg_line_number = -1;
1638716385
int promise_reject_msg_column_number = -1;
1638816386
int promise_reject_line_number = -1;
@@ -16439,12 +16437,12 @@ void PromiseRejectCallback(v8::PromiseRejectMessage reject_message) {
1643916437
break;
1644016438
}
1644116439
START_ALLOW_USE_DEPRECATED();
16442-
case v8::kPromiseRejectAfterResolved: {
16443-
promise_reject_after_resolved_counter++;
16440+
case v8::kDeprecatedPromiseRejectAfterResolved: {
16441+
// Unreachable
1644416442
break;
1644516443
}
16446-
case v8::kPromiseResolveAfterResolved: {
16447-
promise_resolve_after_resolved_counter++;
16444+
case v8::kDeprecatedPromiseResolveAfterResolved: {
16445+
// Unreachable
1644816446
break;
1644916447
}
1645016448
END_ALLOW_USE_DEPRECATED();
@@ -16470,8 +16468,6 @@ v8::Local<v8::Value> RejectValue() {
1647016468
void ResetPromiseStates() {
1647116469
promise_reject_counter = 0;
1647216470
promise_revoke_counter = 0;
16473-
promise_reject_after_resolved_counter = 0;
16474-
promise_resolve_after_resolved_counter = 0;
1647516471
promise_reject_msg_line_number = -1;
1647616472
promise_reject_msg_column_number = -1;
1647716473
promise_reject_line_number = -1;
@@ -16710,8 +16706,6 @@ TEST(PromiseRejectCallback) {
1671016706
CHECK(!GetPromise("v0")->HasHandler());
1671116707
CHECK_EQ(0, promise_reject_counter);
1671216708
CHECK_EQ(0, promise_revoke_counter);
16713-
CHECK_EQ(1, promise_reject_after_resolved_counter);
16714-
CHECK_EQ(0, promise_resolve_after_resolved_counter);
1671516709

1671616710
ResetPromiseStates();
1671716711

@@ -16728,8 +16722,6 @@ TEST(PromiseRejectCallback) {
1672816722
CHECK(!GetPromise("y0")->HasHandler());
1672916723
CHECK_EQ(1, promise_reject_counter);
1673016724
CHECK_EQ(0, promise_revoke_counter);
16731-
CHECK_EQ(0, promise_reject_after_resolved_counter);
16732-
CHECK_EQ(1, promise_resolve_after_resolved_counter);
1673316725

1673416726
// Test stack frames.
1673516727
env.isolate()->SetCaptureStackTraceForUncaughtExceptions(true);

deps/v8/test/inspector/isolate-data.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -402,14 +402,6 @@ void InspectorIsolateData::PromiseRejectHandler(v8::PromiseRejectMessage data) {
402402
strlen(reason_str)));
403403
return;
404404

405-
} else {
406-
START_ALLOW_USE_DEPRECATED();
407-
if (data.GetEvent() == v8::kPromiseRejectAfterResolved ||
408-
data.GetEvent() == v8::kPromiseResolveAfterResolved) {
409-
// Ignore reject/resolve after resolved, like the blink handler.
410-
return;
411-
}
412-
END_ALLOW_USE_DEPRECATED();
413405
}
414406

415407
v8::Local<v8::Value> exception = data.GetValue();

0 commit comments

Comments
 (0)