From aa1caf5ade21ed691579ef1245c25c354d2d4707 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Fri, 29 Sep 2023 15:34:10 -0500 Subject: Issue #1442 & #1691 Follow-up - Part 22 - Changes that came with Dynamic Module Import. At the time we did not have ReadableStreams in our tree so these changes were left out. https://bugzilla.mozilla.org/show_bug.cgi?id=1499140 Implement support for dynamic module import in the interpreter. --- js/src/builtin/Stream.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'js/src/builtin') diff --git a/js/src/builtin/Stream.cpp b/js/src/builtin/Stream.cpp index de2414d351..c8d8e3e324 100644 --- a/js/src/builtin/Stream.cpp +++ b/js/src/builtin/Stream.cpp @@ -284,15 +284,6 @@ ReportArgTypeError(JSContext* cx, const char* funName, const char* expectedType, funName, expectedType, bytes.get()); } -static MOZ_MUST_USE bool -RejectWithPendingError(JSContext* cx, Handle promise) { - // Not much we can do about uncatchable exceptions, just bail. - RootedValue exn(cx); - if (!GetAndClearException(cx, &exn)) - return false; - return PromiseObject::reject(cx, promise, exn); -} - static MOZ_MUST_USE bool ReturnPromiseRejectedWithPendingError(JSContext* cx, const CallArgs& args) { @@ -1183,7 +1174,7 @@ ReadableStreamTee_Cancel(JSContext* cx, Handle teeState, // Step b: Let cancelResult be ! ReadableStreamCancel(stream, compositeReason). RootedObject cancelResult(cx, ReadableStream::cancel(cx, stream, compositeReasonVal)); if (!cancelResult) { - if (!RejectWithPendingError(cx, promise)) + if (!RejectPromiseWithPendingError(cx, promise)) return nullptr; } else { // Step c: Resolve teeState.[[promise]] with cancelResult. -- cgit v1.2.3