Skip to content

Commit 0cc9eb2

Browse files
bakkotv8-scoped@luci-project-accounts.iam.gserviceaccount.com
bakkot
authored and
[email protected]
committed
[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 <[email protected]> Reviewed-by: Camillo Bruni <[email protected]> Reviewed-by: Olivier Flückiger <[email protected]> Cr-Commit-Position: refs/heads/main@{#108040}
1 parent da347af commit 0cc9eb2

7 files changed

Lines changed: 8 additions & 65 deletions

File tree

‎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 {

‎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
}
@@ -419,7 +413,7 @@ transitioning javascript builtin PromiseCapabilityDefaultReject(
419413

420414
// 4. If alreadyResolved.[[Value]] is true, return undefined.
421415
if (alreadyResolved == True) {
422-
return runtime::PromiseRejectAfterResolved(promise, reason);
416+
return Undefined;
423417
}
424418

425419
// 5. Set alreadyResolved.[[Value]] to true.
@@ -447,7 +441,7 @@ transitioning javascript builtin PromiseCapabilityDefaultResolve(
447441

448442
// 4. If alreadyResolved.[[Value]] is true, return undefined.
449443
if (alreadyResolved == True) {
450-
return runtime::PromiseResolveAfterResolved(promise, resolution);
444+
return Undefined;
451445
}
452446

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

‎src/d8/d8.cc‎

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

49364936
void Shell::PromiseRejectCallback(v8::PromiseRejectMessage data) {
49374937
if (options.ignore_unhandled_promises) return;
4938-
START_ALLOW_USE_DEPRECATED();
4939-
if (data.GetEvent() == v8::kPromiseRejectAfterResolved ||
4940-
data.GetEvent() == v8::kPromiseResolveAfterResolved) {
4941-
// Ignore reject/resolve after resolved.
4942-
return;
4943-
}
4944-
END_ALLOW_USE_DEPRECATED();
49454938
v8::Local<v8::Promise> promise = data.GetPromise();
49464939
v8::Isolate* isolate = v8::Isolate::GetCurrent();
49474940
PerIsolateData* isolate_data = PerIsolateData::Get(isolate);

‎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);

‎src/runtime/runtime.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,6 @@ constexpr bool CanTriggerGC(T... properties) {
443443
F(PromiseRevokeReject, 1, 1) \
444444
F(RejectPromise, 3, 1) \
445445
F(ResolvePromise, 2, 1) \
446-
F(PromiseRejectAfterResolved, 2, 1) \
447-
F(PromiseResolveAfterResolved, 2, 1) \
448446
F(ConstructSuppressedError, 3, 1) \
449447
F(ConstructAggregateErrorHelper, 4, 1) \
450448
F(ConstructInternalAggregateErrorHelper, -1 /* <= 5*/, 1)

‎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);

‎test/inspector/isolate-data.cc‎

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

399-
} else {
400-
START_ALLOW_USE_DEPRECATED();
401-
if (data.GetEvent() == v8::kPromiseRejectAfterResolved ||
402-
data.GetEvent() == v8::kPromiseResolveAfterResolved) {
403-
// Ignore reject/resolve after resolved, like the blink handler.
404-
return;
405-
}
406-
END_ALLOW_USE_DEPRECATED();
407399
}
408400

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

0 commit comments

Comments
 (0)