Skip to content

fix(module/source.rs,namespace.rs,synthetic.rs): convert panics to EngineError::Panic using js_expect #5064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nekevss merged 1 commit into from
Mar 14, 2026
Merged

fix(module/source.rs,namespace.rs,synthetic.rs): convert panics to EngineError::Panic using js_expect #5064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions core/engine/src/module/namespace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::object::internal_methods::{
};
use crate::object::{JsData, JsPrototype};
use crate::property::{PropertyDescriptor, PropertyKey};
use crate::{Context, JsResult, JsString, JsValue, js_string, object::JsObject};
use crate::{Context, JsExpect, JsResult, JsString, JsValue, js_string, object::JsObject};
use crate::{JsNativeError, Module};

use super::{BindingName, ResolvedBinding};
Expand Down Expand Up @@ -149,7 +149,7 @@ fn module_namespace_exotic_set_prototype_of(
// 1. Return ! SetImmutablePrototype(O, V).
Ok(
immutable_prototype_exotic_set_prototype_of(obj, val, context)
.expect("this must not fail per the spec"),
.js_expect("this must not fail per the spec")?,
)
}

Expand Down Expand Up @@ -188,7 +188,7 @@ fn module_namespace_exotic_get_own_property(
{
let obj = obj
.downcast_ref::<ModuleNamespace>()
.expect("internal method can only be called on module namespace objects");
.js_expect("internal method can only be called on module namespace objects")?;
// 2. Let exports be O.[[Exports]].
let exports = obj.exports();

Expand Down Expand Up @@ -266,7 +266,7 @@ fn module_namespace_exotic_has_property(

let obj = obj
.downcast_ref::<ModuleNamespace>()
.expect("internal method can only be called on module namespace objects");
.js_expect("internal method can only be called on module namespace objects")?;

// 2. Let exports be O.[[Exports]].
let exports = obj.exports();
Expand Down Expand Up @@ -302,7 +302,7 @@ fn module_namespace_exotic_try_get(

let obj = obj
.downcast_ref::<ModuleNamespace>()
.expect("internal method can only be called on module namespace objects");
.js_expect("internal method can only be called on module namespace objects")?;

// 2. Let exports be O.[[Exports]].
let exports = obj.exports();
Expand Down Expand Up @@ -352,10 +352,10 @@ fn module_namespace_exotic_try_get(
let locator = env
.kind()
.as_module()
.expect("must be module environment")
.js_expect("must be module environment")?
.compile()
.get_binding(name)
.expect("checked before that the name was reachable");
.js_expect("checked before that the name was reachable")?;

// 12. Return ? targetEnv.GetBindingValue(binding.[[BindingName]], true).
env.get(locator.binding_index()).map(Some).ok_or_else(|| {
Expand Down Expand Up @@ -391,7 +391,7 @@ fn module_namespace_exotic_get(

let obj = obj
.downcast_ref::<ModuleNamespace>()
.expect("internal method can only be called on module namespace objects");
.js_expect("internal method can only be called on module namespace objects")?;

// 2. Let exports be O.[[Exports]].
let exports = obj.exports();
Expand Down Expand Up @@ -440,10 +440,10 @@ fn module_namespace_exotic_get(
let locator = env
.kind()
.as_module()
.expect("must be module environment")
.js_expect("must be module environment")?
.compile()
.get_binding(name)
.expect("checked before that the name was reachable");
.js_expect("checked before that the name was reachable")?;

// 12. Return ? targetEnv.GetBindingValue(binding.[[BindingName]], true).
env.get(locator.binding_index()).ok_or_else(|| {
Expand Down Expand Up @@ -493,7 +493,7 @@ fn module_namespace_exotic_delete(

let obj = obj
.downcast_ref::<ModuleNamespace>()
.expect("internal method can only be called on module namespace objects");
.js_expect("internal method can only be called on module namespace objects")?;

// 2. Let exports be O.[[Exports]].
let exports = obj.exports();
Expand All @@ -515,7 +515,7 @@ fn module_namespace_exotic_own_property_keys(

let obj = obj
.downcast_ref::<ModuleNamespace>()
.expect("internal method can only be called on module namespace objects");
.js_expect("internal method can only be called on module namespace objects")?;

// 1. Let exports be O.[[Exports]].
let exports = obj.exports();
Expand Down
72 changes: 40 additions & 32 deletions core/engine/src/module/source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use indexmap::IndexSet;
use rustc_hash::{FxHashMap, FxHashSet, FxHasher};

use crate::{
Context, JsArgs, JsError, JsNativeError, JsObject, JsResult, JsString, JsValue, NativeFunction,
SpannedSourceText,
Context, JsArgs, JsError, JsExpect, JsNativeError, JsObject, JsResult, JsString, JsValue,
NativeFunction, SpannedSourceText,
builtins::{Promise, promise::PromiseCapability},
bytecompiler::{BindingAccessOpcode, ByteCompiler, FunctionSpec, ToJsString},
environments::{DeclarativeEnvironment, EnvironmentStack},
Expand Down Expand Up @@ -539,7 +539,7 @@ impl SourceTextModule {
.capability
.reject()
.call(&JsValue::undefined(), &[err], &mut context.borrow_mut())
.expect("cannot fail for the default reject function");
.js_expect("cannot fail for the default reject function")?;
}
}

Expand Down Expand Up @@ -935,7 +935,7 @@ impl SourceTextModule {
dfs_ancestor_index, ..
} = status
.dfs_info_mut()
.expect("should be on the linking state");
.js_expect("should be on the linking state")?;
*dfs_ancestor_index = usize::min(*dfs_ancestor_index, required_index);
}
}
Expand Down Expand Up @@ -972,7 +972,7 @@ impl SourceTextModule {
Some(info) if info.dfs_ancestor_index == info.dfs_index => loop {
// i. Let requiredModule be the last element of stack.
// ii. Remove the last element of stack.
let last = stack.pop().expect("should have at least one element");
let last = stack.pop().js_expect("should have at least one element")?;
let ModuleKind::SourceText(last_src) = last.kind() else {
unreachable!("iii. Assert: requiredModule is a Cyclic Module Record.")
};
Expand Down Expand Up @@ -1042,10 +1042,14 @@ impl SourceTextModule {
..
} => (
cycle_root.clone(),
top_level_capability.as_ref().map(|cap| {
JsPromise::from_object(cap.promise().clone())
.expect("promise created from the %Promise% intrinsic is always native")
}),
top_level_capability
.as_ref()
.map(|cap| {
JsPromise::from_object(cap.promise().clone()).js_expect(
"promise created from the %Promise% intrinsic is always native",
)
})
.transpose()?,
),
}
};
Expand All @@ -1065,7 +1069,9 @@ impl SourceTextModule {
&context.intrinsics().constructors().promise().constructor(),
context,
)
.expect("capability creation must always succeed when using the `%Promise%` intrinsic");
.js_expect(
"capability creation must always succeed when using the `%Promise%` intrinsic",
)?;

// 8. Let result be Completion(InnerModuleEvaluation(module, stack, 0)).
let ModuleKind::SourceText(module_src) = module.kind() else {
Expand All @@ -1092,7 +1098,7 @@ impl SourceTextModule {
capability
.resolve()
.call(&JsValue::undefined(), &[], context)
.expect("cannot fail for the default resolve function");
.js_expect("cannot fail for the default resolve function")?;
}

// d. Assert: stack is empty.
Expand Down Expand Up @@ -1139,13 +1145,13 @@ impl SourceTextModule {
capability
.reject()
.call(&JsValue::undefined(), &[err.into_opaque(context)?], context)
.expect("cannot fail for the default reject function");
.js_expect("cannot fail for the default reject function")?;
}
}

// 11. Return capability.[[Promise]].
Ok(JsPromise::from_object(capability.promise().clone())
.expect("promise created from the %Promise% intrinsic is always native"))
.js_expect("promise created from the %Promise% intrinsic is always native")?)
}

/// Abstract operation [`InnerModuleEvaluation ( module, stack, index )`][spec]
Expand Down Expand Up @@ -1297,7 +1303,7 @@ impl SourceTextModule {
let mut status = self.status.borrow_mut();
let info = status
.dfs_info_mut()
.expect("self should still be in the evaluating state");
.js_expect("self should still be in the evaluating state")?;
info.dfs_ancestor_index =
usize::min(info.dfs_ancestor_index, req_info.dfs_ancestor_index);
}
Expand Down Expand Up @@ -1341,9 +1347,9 @@ impl SourceTextModule {
self.execute(module_self, None, context)?;
}

let dfs_info = self.status.borrow().dfs_info().copied().expect(
let dfs_info = self.status.borrow().dfs_info().copied().js_expect(
"haven't transitioned from the `Evaluating` state, so it should have its dfs info",
);
)?;

// 14. Assert: module occurs exactly once in stack.
debug_assert_eq!(stack.iter().filter(|m| *m == module_self).count(), 1);
Expand All @@ -1359,7 +1365,7 @@ impl SourceTextModule {
// ii. Remove the last element of stack.
let required_module = stack
.pop()
.expect("should at least have `self` in the stack");
.js_expect("should at least have `self` in the stack")?;
let is_self = module_self == &required_module;

let ModuleKind::SourceText(required_module_src) = required_module.kind() else {
Expand Down Expand Up @@ -1607,7 +1613,7 @@ impl SourceTextModule {
let status = self.status.borrow();
let (source, source_text) = status
.source()
.expect("module can only initialize its environment in the linking phase");
.js_expect("module can only initialize its environment in the linking phase")?;

// 5. Let env be NewModuleEnvironment(realm.[[GlobalEnv]]).
// 6. Set module.[[Environment]] to env.
Expand Down Expand Up @@ -1665,7 +1671,9 @@ impl SourceTextModule {
// 2. Perform ! env.CreateImmutableBinding(in.[[LocalName]], true).
// 3. Perform ! env.InitializeBinding(in.[[LocalName]], namespace).
let local_name = entry.local_name().to_js_string(compiler.interner());
let locator = env.get_binding(&local_name).expect("binding must exist");
let locator = env
.get_binding(&local_name)
.js_expect("binding must exist")?;

if let BindingName::Name(_) = resolution.binding_name() {
// 1. Perform env.CreateImportBinding(in.[[LocalName]], resolution.[[Module]],
Expand All @@ -1688,7 +1696,7 @@ impl SourceTextModule {
// ii. Perform ! env.CreateImmutableBinding(in.[[LocalName]], true).
// iii. Perform ! env.InitializeBinding(in.[[LocalName]], namespace).
let name = entry.local_name().to_js_string(compiler.interner());
let locator = env.get_binding(&name).expect("binding must exist");
let locator = env.get_binding(&name).js_expect("binding must exist")?;

// i. Let namespace be GetModuleNamespace(importedModule).
// deferred to initialization below
Expand Down Expand Up @@ -1716,7 +1724,7 @@ impl SourceTextModule {
// 2. Perform ! env.InitializeBinding(dn, undefined).
let binding = env
.get_binding_reference(&name)
.expect("binding must exist");
.js_expect("binding must exist")?;
let index = compiler.insert_binding(binding);
compiler.emit_binding_access(
BindingAccessOpcode::DefInitVar,
Expand Down Expand Up @@ -1749,25 +1757,25 @@ impl SourceTextModule {
let (spec, locator): (FunctionSpec<'_>, _) = match declaration {
LexicallyScopedDeclaration::FunctionDeclaration(f) => {
let name = bound_names(f)[0].to_js_string(compiler.interner());
let locator = env.get_binding(&name).expect("binding must exist");
let locator = env.get_binding(&name).js_expect("binding must exist")?;

(f.into(), locator)
}
LexicallyScopedDeclaration::GeneratorDeclaration(g) => {
let name = bound_names(g)[0].to_js_string(compiler.interner());
let locator = env.get_binding(&name).expect("binding must exist");
let locator = env.get_binding(&name).js_expect("binding must exist")?;

(g.into(), locator)
}
LexicallyScopedDeclaration::AsyncFunctionDeclaration(af) => {
let name = bound_names(af)[0].to_js_string(compiler.interner());
let locator = env.get_binding(&name).expect("binding must exist");
let locator = env.get_binding(&name).js_expect("binding must exist")?;

(af.into(), locator)
}
LexicallyScopedDeclaration::AsyncGeneratorDeclaration(ag) => {
let name = bound_names(ag)[0].to_js_string(compiler.interner());
let locator = env.get_binding(&name).expect("binding must exist");
let locator = env.get_binding(&name).js_expect("binding must exist")?;

(ag.into(), locator)
}
Expand Down Expand Up @@ -1843,10 +1851,10 @@ impl SourceTextModule {
frame
.environments
.current_declarative_ref(frame.realm.environment())
.expect("must be declarative")
.js_expect("must be declarative")?
.kind()
.as_module()
.expect("last environment should be the module env")
.js_expect("last environment should be the module env")?
.set_indirect(
locator.binding_index(),
export_locator.module().clone(),
Expand Down Expand Up @@ -1890,13 +1898,13 @@ impl SourceTextModule {
let frame = context
.vm
.pop_frame()
.expect("There should be a call frame");
.js_expect("There should be a call frame")?;

let env = frame
.environments
.current_declarative_ref(frame.realm.environment())
.cloned()
.expect("frame must have a declarative environment");
.js_expect("frame must have a declarative environment")?;

// 16. Set module.[[Context]] to moduleContext.
self.status.borrow_mut().transition(|state| match state {
Expand Down Expand Up @@ -2051,7 +2059,7 @@ fn async_module_execution_fulfilled(module: &Module, context: &mut Context) -> J
// b. Perform ! Call(module.[[TopLevelCapability]].[[Resolve]], undefined, « undefined »).
cap.resolve()
.call(&JsValue::undefined(), &[], context)
.expect("default `resolve` function cannot fail");
.js_expect("default `resolve` function cannot fail")?;
}

// 8. Let execList be a new empty List.
Expand Down Expand Up @@ -2133,7 +2141,7 @@ fn async_module_execution_fulfilled(module: &Module, context: &mut Context) -> J
// b. Perform ! Call(m.[[TopLevelCapability]].[[Resolve]], undefined, « undefined »).
cap.resolve()
.call(&JsValue::undefined(), &[], context)
.expect("default `resolve` function cannot fail");
.js_expect("default `resolve` function cannot fail")?;
}
}
}
Expand Down Expand Up @@ -2203,7 +2211,7 @@ fn async_module_execution_rejected(
&[error.into_opaque(context)?],
context,
)
.expect("default `reject` function cannot fail");
.js_expect("default `reject` function cannot fail")?;
}
// 9. Return unused.
Ok(())
Expand Down
13 changes: 8 additions & 5 deletions core/engine/src/module/synthetic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use rustc_hash::FxHashSet;

use super::{BindingName, ResolveExportError, ResolvedBinding};
use crate::{
Context, JsNativeError, JsResult, JsString, JsValue, Module, SpannedSourceText,
Context, JsExpect, JsNativeError, JsResult, JsString, JsValue, Module, SpannedSourceText,
builtins::promise::ResolvingFunctions,
bytecompiler::ByteCompiler,
class::{Class, ClassBuilder},
Expand Down Expand Up @@ -208,7 +208,7 @@ impl SyntheticModule {
let locator = env
.kind()
.as_module()
.expect("must be module environment")
.js_expect("must be module environment")?
.compile()
.get_binding(export_name)
.ok_or_else(|| {
Expand Down Expand Up @@ -385,7 +385,7 @@ impl SyntheticModule {
.into()],
context,
)
.expect("native resolving functions cannot throw");
.js_expect("native resolving functions cannot throw")?;
return Ok(promise);
}
ModuleStatus::Linked { eval_context, .. } => eval_context.clone(),
Expand Down Expand Up @@ -421,7 +421,10 @@ impl SyntheticModule {

// 11. Suspend moduleContext and remove it from the execution context stack.
// 12. Resume the context that is now on the top of the execution context stack as the running execution context.
let frame = context.vm.pop_frame().expect("there should be a frame");
let frame = context
.vm
.pop_frame()
.js_expect("there should be a frame")?;
context.vm.stack.truncate_to_frame(&frame);

// 13. Let pc be ! NewPromiseCapability(%Promise%).
Expand All @@ -433,7 +436,7 @@ impl SyntheticModule {
// 14. IfAbruptRejectPromise(result, pc).
Err(err) => reject.call(&JsValue::undefined(), &[err.into_opaque(context)?], context),
}
.expect("default resolving functions cannot throw");
.js_expect("default resolving functions cannot throw")?;

self.state.borrow_mut().transition(|state| match state {
ModuleStatus::Linked { environment, .. } => ModuleStatus::Evaluated {
Expand Down
Loading