Skip to content

feat(ecmascript): Promise.prototype.finally #824

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
merged 4 commits into from
Aug 18, 2025
Merged

feat(ecmascript): Promise.prototype.finally #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca612de
feat(ecamscript): Promise.prototype.finally this_value checking
aapoalas Aug 18, 2025
9bb9bb3
refactor(ecmascript): Function internal methods
aapoalas Aug 18, 2025
05bd8e7
feat(ecmascript): Add BuiltinPromiseFinallyFunction, use in Promise.p…
aapoalas Aug 18, 2025
841a284
chore(test262): Update expectations
aapoalas Aug 18, 2025
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
147 changes: 11 additions & 136 deletions nova_vm/src/ecmascript/builtins/bound_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,12 @@ use crate::{
testing_and_comparison::is_constructor,
},
execution::{
Agent, JsResult, ProtoIntrinsics,
Agent, JsResult,
agent::{TryResult, unwrap_try},
},
types::{
BoundFunctionHeapData, Function, FunctionInternalProperties, InternalMethods,
InternalSlots, IntoFunction, IntoValue, Object, OrdinaryObject, PropertyDescriptor,
PropertyKey, SetResult, String, TryGetResult, TryHasResult, Value,
function_create_backing_object, function_internal_define_own_property,
function_internal_delete, function_internal_get, function_internal_get_own_property,
function_internal_has_property, function_internal_own_property_keys,
function_internal_set, function_try_get, function_try_has_property, function_try_set,
IntoFunction, IntoValue, Object, OrdinaryObject, String, Value,
},
},
engine::{
Expand All @@ -34,7 +29,7 @@ use crate::{
},
};

use super::{ArgumentsList, ordinary::caches::PropertyLookupCache};
use super::ArgumentsList;

#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[repr(transparent)]
Expand Down Expand Up @@ -154,17 +149,17 @@ impl<'a> FunctionInternalProperties<'a> for BoundFunction<'a> {
fn get_length(self, agent: &Agent) -> u8 {
agent[self].length
}
}

impl<'a> InternalSlots<'a> for BoundFunction<'a> {
const DEFAULT_PROTOTYPE: ProtoIntrinsics = ProtoIntrinsics::Function;

#[inline(always)]
fn get_backing_object(self, agent: &Agent) -> Option<OrdinaryObject<'static>> {
fn get_function_backing_object(self, agent: &Agent) -> Option<OrdinaryObject<'static>> {
agent[self].object_index.unbind()
}

fn set_backing_object(self, agent: &mut Agent, backing_object: OrdinaryObject<'static>) {
fn set_function_backing_object(
self,
agent: &mut Agent,
backing_object: OrdinaryObject<'static>,
) {
assert!(
agent[self]
.object_index
Expand All @@ -173,134 +168,14 @@ impl<'a> InternalSlots<'a> for BoundFunction<'a> {
);
}

fn create_backing_object(self, agent: &mut Agent) -> OrdinaryObject<'static> {
function_create_backing_object(self, agent)
}
}

impl<'a> InternalMethods<'a> for BoundFunction<'a> {
fn try_get_own_property<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, Option<PropertyDescriptor<'gc>>> {
TryResult::Continue(function_internal_get_own_property(
self,
agent,
property_key,
cache,
gc,
))
}

fn try_define_own_property<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
property_descriptor: PropertyDescriptor,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, bool> {
function_internal_define_own_property(
self,
agent,
property_key,
property_descriptor,
cache,
gc,
)
}

fn try_has_property<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, TryHasResult<'gc>> {
function_try_has_property(self, agent, property_key, cache, gc)
}

fn internal_has_property<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
gc: GcScope<'gc, '_>,
) -> JsResult<'gc, bool> {
function_internal_has_property(self, agent, property_key, gc)
}

fn try_get<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
receiver: Value,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, TryGetResult<'gc>> {
function_try_get(self, agent, property_key, receiver, cache, gc)
}

fn internal_get<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
receiver: Value,
gc: GcScope<'gc, '_>,
) -> JsResult<'gc, Value<'gc>> {
function_internal_get(self, agent, property_key, receiver, gc)
}

fn try_set<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
value: Value,
receiver: Value,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, SetResult<'gc>> {
function_try_set(self, agent, property_key, value, receiver, cache, gc)
}

fn internal_set<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
value: Value,
receiver: Value,
gc: GcScope<'gc, '_>,
) -> JsResult<'gc, bool> {
function_internal_set(self, agent, property_key, value, receiver, gc)
}

fn try_delete<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, bool> {
TryResult::Continue(function_internal_delete(self, agent, property_key, gc))
}

fn try_own_property_keys<'gc>(
self,
agent: &mut Agent,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, Vec<PropertyKey<'gc>>> {
TryResult::Continue(function_internal_own_property_keys(self, agent, gc))
}

/// ### [10.4.1.1 \[\[Call\]\] ( thisArgument, argumentsList )](https://tc39.es/ecma262/#sec-bound-function-exotic-objects-call-thisargument-argumentslist)
///
/// The \[\[Call]] internal method of a bound function exotic object F
/// takes arguments thisArgument (an ECMAScript language value) and
/// argumentsList (a List of ECMAScript language values) and returns either
/// a normal completion containing an ECMAScript language value or a throw
/// completion.
fn internal_call<'gc>(
fn function_call<'gc>(
self,
agent: &mut Agent,
_: Value,
Expand Down Expand Up @@ -350,7 +225,7 @@ impl<'a> InternalMethods<'a> for BoundFunction<'a> {
/// takes arguments argumentsList (a List of ECMAScript language values)
/// and newTarget (a constructor) and returns either a normal completion
/// containing an Object or a throw completion.
fn internal_construct<'gc>(
fn function_construct<'gc>(
self,
agent: &mut Agent,
arguments_list: ArgumentsList,
Expand Down
149 changes: 12 additions & 137 deletions nova_vm/src/ecmascript/builtins/builtin_constructor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,17 @@ use oxc_span::Span;
use crate::{
ecmascript::{
execution::{
Agent, Environment, ExecutionContext, JsResult, PrivateEnvironment, ProtoIntrinsics,
agent::{ExceptionType, TryResult},
Agent, Environment, ExecutionContext, JsResult, PrivateEnvironment,
agent::ExceptionType,
},
scripts_and_modules::source_code::SourceCode,
syntax_directed_operations::class_definitions::{
base_class_default_constructor, derived_class_default_constructor,
},
types::{
BUILTIN_STRING_MEMORY, BuiltinConstructorHeapData, Function,
FunctionInternalProperties, InternalMethods, InternalSlots, IntoFunction, IntoObject,
IntoValue, Object, OrdinaryObject, PropertyDescriptor, PropertyKey, SetResult, String,
TryGetResult, TryHasResult, Value, function_create_backing_object,
function_internal_define_own_property, function_internal_delete, function_internal_get,
function_internal_get_own_property, function_internal_has_property,
function_internal_own_property_keys, function_internal_set, function_try_get,
function_try_has_property, function_try_set,
FunctionInternalProperties, IntoFunction, IntoObject, IntoValue, Object,
OrdinaryObject, PropertyKey, String, Value,
},
},
engine::{
Expand All @@ -38,7 +33,7 @@ use crate::{
},
};

use super::{ArgumentsList, ordinary::caches::PropertyLookupCache};
use super::ArgumentsList;

#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
pub struct BuiltinConstructorFunction<'a>(pub(crate) BuiltinConstructorIndex<'a>);
Expand Down Expand Up @@ -171,138 +166,18 @@ impl<'a> FunctionInternalProperties<'a> for BuiltinConstructorFunction<'a> {
fn get_length(self, _: &Agent) -> u8 {
unreachable!();
}
}

impl<'a> InternalSlots<'a> for BuiltinConstructorFunction<'a> {
const DEFAULT_PROTOTYPE: ProtoIntrinsics = ProtoIntrinsics::Function;

#[inline(always)]
fn get_backing_object(self, agent: &Agent) -> Option<OrdinaryObject<'static>> {
fn get_function_backing_object(self, agent: &Agent) -> Option<OrdinaryObject<'static>> {
agent[self].object_index
}

fn set_backing_object(self, agent: &mut Agent, backing_object: OrdinaryObject<'static>) {
assert!(agent[self].object_index.replace(backing_object).is_none());
}

fn create_backing_object(self, agent: &mut Agent) -> OrdinaryObject<'static> {
function_create_backing_object(self, agent)
}
}

impl<'a> InternalMethods<'a> for BuiltinConstructorFunction<'a> {
fn try_get_own_property<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, Option<PropertyDescriptor<'gc>>> {
TryResult::Continue(function_internal_get_own_property(
self,
agent,
property_key,
cache,
gc,
))
}

fn try_define_own_property<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
property_descriptor: PropertyDescriptor,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, bool> {
function_internal_define_own_property(
self,
agent,
property_key,
property_descriptor,
cache,
gc,
)
}

fn try_has_property<'gc>(
fn set_function_backing_object(
self,
agent: &mut Agent,
property_key: PropertyKey,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, TryHasResult<'gc>> {
function_try_has_property(self, agent, property_key, cache, gc)
}

fn internal_has_property<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
gc: GcScope<'gc, '_>,
) -> JsResult<'gc, bool> {
function_internal_has_property(self, agent, property_key, gc)
}

fn try_get<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
receiver: Value,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, TryGetResult<'gc>> {
function_try_get(self, agent, property_key, receiver, cache, gc)
}

fn internal_get<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
receiver: Value,
gc: GcScope<'gc, '_>,
) -> JsResult<'gc, Value<'gc>> {
function_internal_get(self, agent, property_key, receiver, gc)
}

fn try_set<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
value: Value,
receiver: Value,
cache: Option<PropertyLookupCache>,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, SetResult<'gc>> {
function_try_set(self, agent, property_key, value, receiver, cache, gc)
}

fn internal_set<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
value: Value,
receiver: Value,
gc: GcScope<'gc, '_>,
) -> JsResult<'gc, bool> {
function_internal_set(self, agent, property_key, value, receiver, gc)
}

fn try_delete<'gc>(
self,
agent: &mut Agent,
property_key: PropertyKey,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, bool> {
TryResult::Continue(function_internal_delete(self, agent, property_key, gc))
}

fn try_own_property_keys<'gc>(
self,
agent: &mut Agent,
gc: NoGcScope<'gc, '_>,
) -> TryResult<'gc, Vec<PropertyKey<'gc>>> {
TryResult::Continue(function_internal_own_property_keys(self, agent, gc))
backing_object: OrdinaryObject<'static>,
) {
assert!(agent[self].object_index.replace(backing_object).is_none());
}

/// ### [10.3.1 \[\[Call\]\] ( thisArgument, argumentsList )](https://tc39.es/ecma262/#sec-built-in-function-objects-call-thisargument-argumentslist)
Expand All @@ -312,7 +187,7 @@ impl<'a> InternalMethods<'a> for BuiltinConstructorFunction<'a> {
/// (a List of ECMAScript language values) and returns either a normal
/// completion containing an ECMAScript language value or a throw
/// completion.
fn internal_call<'gc>(
fn function_call<'gc>(
self,
agent: &mut Agent,
_: Value,
Expand All @@ -334,7 +209,7 @@ impl<'a> InternalMethods<'a> for BuiltinConstructorFunction<'a> {
/// the method is present) takes arguments argumentsList (a List of
/// ECMAScript language values) and newTarget (a constructor) and returns
/// either a normal completion containing an Object or a throw completion.
fn internal_construct<'gc>(
fn function_construct<'gc>(
self,
agent: &mut Agent,
arguments_list: ArgumentsList,
Expand Down
Loading
Loading