Skip to content
This repository was archived by the owner on Apr 2, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ deno_error = { version = "0.7.0", features = ["serde_json", "serde", "url", "tok
deno_ops = { version = "0.262.0", path = "./ops" }
deno_unsync = "0.4.2"
serde_v8 = { version = "0.295.0", path = "./serde_v8" }
v8 = { version = "145.0.0", default-features = false }
v8 = { version = "146.1.0", default-features = false }

anyhow = "1"
bencher = "0.1"
Expand Down
12 changes: 12 additions & 0 deletions core/modules/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1543,10 +1543,22 @@ impl ModuleMap {
let promise = v8::Local::<v8::Promise>::try_from(value)
.expect("Expected to get promise as module evaluation result");

promise.mark_as_handled();

match promise.state() {
PromiseState::Fulfilled => Ok(()),
PromiseState::Rejected => {
let err = promise.result(tc_scope);

let exception_state = JsRealm::exception_state_from_scope(tc_scope);
// TODO: remove after crrev.com/c/7595271
exception_state.track_promise_rejection(
tc_scope,
promise,
v8::PromiseRejectEvent::PromiseHandlerAddedAfterReject,
None,
);

Err(
CoreErrorKind::Js(JsError::from_v8_exception(tc_scope, err))
.into_box(),
Expand Down
17 changes: 15 additions & 2 deletions core/ops_builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ pub fn op_print(
Ok(())
}

pub struct WasmStreamingResource(pub(crate) RefCell<v8::WasmStreaming>);
pub struct WasmStreamingResource(pub(crate) RefCell<v8::WasmStreaming<false>>);

impl Resource for WasmStreamingResource {
fn close(self: Rc<Self>) {
Expand Down Expand Up @@ -623,7 +623,20 @@ fn wrap_module<'s, 'i>(

wrapper_module.instantiate_module(scope, resolve_callback)?;

wrapper_module.evaluate(scope)?;
let result = wrapper_module.evaluate(scope)?;
if let Ok(promise) = result.try_cast::<v8::Promise>() {
promise.mark_as_handled();
if promise.state() == v8::PromiseState::Rejected {
let exception_state = JsRealm::exception_state_from_scope(scope);
// TODO: remove after crrev.com/c/7595271
exception_state.track_promise_rejection(
scope,
promise,
v8::PromiseRejectEvent::PromiseHandlerAddedAfterReject,
None,
);
}
}

Some(wrapper_module)
}
Expand Down
6 changes: 3 additions & 3 deletions core/runtime/tests/misc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ async fn global_template_middleware() {
) -> v8::Intercepted {
CALLS.lock().push("descriptor".to_string());

v8::Intercepted::No
v8::Intercepted::kNo
}

pub fn setter<'s>(
Expand All @@ -1446,7 +1446,7 @@ async fn global_template_middleware() {
_rv: v8::ReturnValue<()>,
) -> v8::Intercepted {
CALLS.lock().push("setter".to_string());
v8::Intercepted::No
v8::Intercepted::kNo
}

fn definer<'s>(
Expand All @@ -1457,7 +1457,7 @@ async fn global_template_middleware() {
_rv: v8::ReturnValue<()>,
) -> v8::Intercepted {
CALLS.lock().push("definer".to_string());
v8::Intercepted::No
v8::Intercepted::kNo
}

pub fn gt_middleware<'s>(
Expand Down
4 changes: 2 additions & 2 deletions ops/op2/dispatch_fast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ impl V8FastCallType {
V8FastCallType::Bool => quote!(CType::Bool.as_info()),
V8FastCallType::U32 => quote!(v8::fast_api::CTypeInfo::new(
CType::Uint32,
v8::fast_api::Flags::Clamp
v8::fast_api::Flags::empty(),
)),
V8FastCallType::I32 => quote!(v8::fast_api::CTypeInfo::new(
CType::Int32,
v8::fast_api::Flags::Clamp
v8::fast_api::Flags::empty(),
)),
V8FastCallType::U64 => quote!(CType::Uint64.as_info()),
V8FastCallType::I64 => quote!(CType::Int64.as_info()),
Expand Down
4 changes: 2 additions & 2 deletions ops/op2/test_cases/async/async_deferred.out

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ops/op2/test_cases/async/async_lazy.out

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ops/op2/test_cases/sync/add.out

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions ops/op2/test_cases/sync/fast_alternative.out

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ops/op2/test_cases/sync/result_primitive.out

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading