From 68f4b359c53b241e0ef82b640e84d8de70cfb805 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:12:31 +0200 Subject: Add exception to rejection logic in `generic_call` (#32950) * exception in JS Promise Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * EXCEPTION_TO_REJECTION on generic_call Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * PromiseRejectionEvent should handle promise as object Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * expectations Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --------- Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- components/script/dom/bindings/codegen/CodegenRust.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index fa77c516abb..154ec01c7ae 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -1870,13 +1870,17 @@ class MethodDefiner(PropertyDefiner): else: selfHostedName = "0 as *const libc::c_char" if m.get("methodInfo", True): + if m.get("returnsPromise", False): + exceptionToRejection = "true" + else: + exceptionToRejection = "false" identifier = m.get("nativeName", m["name"]) # Go through an intermediate type here, because it's not # easy to tell whether the methodinfo is a JSJitInfo or # a JSTypedMethodJitInfo here. The compiler knows, though, # so let it do the work. jitinfo = "&%s_methodinfo as *const _ as *const JSJitInfo" % identifier - accessor = "Some(generic_method)" + accessor = f"Some(generic_method::<{exceptionToRejection}>)" else: if m.get("returnsPromise", False): jitinfo = "&%s_methodinfo" % m.get("nativeName", m["name"]) @@ -1977,10 +1981,14 @@ class AttrDefiner(PropertyDefiner): accessor = 'get_' + self.descriptor.internalNameFor(attr.identifier.name) jitinfo = "0 as *const JSJitInfo" else: + if attr.type.isPromise(): + exceptionToRejection = "true" + else: + exceptionToRejection = "false" if attr.hasLegacyLenientThis(): - accessor = "generic_lenient_getter" + accessor = f"generic_lenient_getter::<{exceptionToRejection}>" else: - accessor = "generic_getter" + accessor = f"generic_getter::<{exceptionToRejection}>" jitinfo = "&%s_getterinfo" % self.descriptor.internalNameFor(attr.identifier.name) return ("JSNativeWrapper { op: Some(%(native)s), info: %(info)s }" -- cgit v1.2.3