fix: codegen on callback (#32537)

* Fix codegen on callback

* Add test callbacks to testbinding.rs

3 files changed, 24 insertions, 8 deletions

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 891f24f95ac..4163947f87b 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2258,6 +2258,10 @@ class CGImports(CGWrapper):
         descriptorProvider = config.getDescriptorProvider()
         extras = []
         for t in types:
+            # Importing these callbacks in the same module that defines them is an error.
+            if t.isCallback():
+                if getIdentifier(t) in [c.identifier for c in callbacks]:
+                    continue
             # Importing these types in the same module that defines them is an error.
             if t in dictionaries or t in enums:
                 continue
@@ -7327,7 +7331,7 @@ class CallbackMember(CGNativeMember):
                                 visibility=visibility)
         # We have to do all the generation of our body now, because
         # the caller relies on us throwing if we can't manage it.
-        self.exceptionCode = "return Err(JSFailed);"
+        self.exceptionCode = "return Err(JSFailed);\n"
         self.body = self.getImpl()
 
     def getImpl(self):
@@ -7390,14 +7394,19 @@ class CallbackMember(CGNativeMember):
         # Just reget the arglist from self.originalSig, because our superclasses
         # just have way to many members they like to clobber, so I can't find a
         # safe member name to store it in.
+        arglist = self.originalSig[1]
         argConversions = [self.getArgConversion(i, arg) for (i, arg)
-                          in enumerate(self.originalSig[1])]
+                          in enumerate(arglist)]
         # Do them back to front, so our argc modifications will work
         # correctly, because we examine trailing arguments first.
         argConversions.reverse()
         argConversions = [CGGeneric(c) for c in argConversions]
-        if self.argCount > 0:
-            argConversions.insert(0, self.getArgcDecl())
+        # If arg count is only 1 but it's optional and not default value,
+        # argc should be mutable.
+        if self.argCount == 1 and not (arglist[0].optional and not arglist[0].defaultValue):
+            argConversions.insert(0, self.getArgcDecl(True))
+        elif self.argCount > 0:
+            argConversions.insert(0, self.getArgcDecl(False))
         # And slap them together.
         return CGList(argConversions, "\n\n").define() + "\n\n"
 
@@ -7462,8 +7471,8 @@ class CallbackMember(CGNativeMember):
             "    return Err(JSFailed);\n"
             "}\n")
 
-    def getArgcDecl(self):
-        if self.argCount <= 1:
+    def getArgcDecl(self, immutable):
+        if immutable:
             return CGGeneric("let argc = %s;" % self.argCountStr)
         return CGGeneric("let mut argc = %s;" % self.argCountStr)
 
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
index 388af65e23c..b3ddf5fd91b 100644
--- a/components/script/dom/testbinding.rs
+++ b/components/script/dom/testbinding.rs
@@ -612,14 +612,18 @@ impl TestBindingMethods for TestBinding {
             unsignedShortValue: None,
             usvstringValue: None,
             nonRequiredNullable: None,
-            nonRequiredNullable2: Some(None), // null
+            nonRequiredNullable2: Some(None),
+            noCallbackImport: None,
+            noCallbackImport2: None,
         })
     }
 
     fn DictMatchesPassedValues(&self, arg: RootedTraceableBox<TestDictionary>) -> bool {
         arg.type_.as_ref().map(|s| s == "success").unwrap_or(false) &&
             arg.nonRequiredNullable.is_none() &&
-            arg.nonRequiredNullable2 == Some(None)
+            arg.nonRequiredNullable2 == Some(None) &&
+            arg.noCallbackImport == None &&
+            arg.noCallbackImport2 == None
     }
 
     fn PassBoolean(&self, _: bool) {}
diff --git a/components/script/dom/webidls/TestBinding.webidl b/components/script/dom/webidls/TestBinding.webidl
index 4552a6e002a..5c00dbda387 100644
--- a/components/script/dom/webidls/TestBinding.webidl
+++ b/components/script/dom/webidls/TestBinding.webidl
@@ -43,6 +43,8 @@ dictionary TestDictionary {
   // in dictionaries.
   DOMString? nonRequiredNullable;
   DOMString? nonRequiredNullable2;
+  SimpleCallback noCallbackImport;
+  callbackWithOnlyOneOptionalArg noCallbackImport2;
 };
 
 dictionary TestDictionaryParent {
@@ -594,6 +596,7 @@ partial interface TestBinding {
 };
 
 callback SimpleCallback = undefined(any value);
+callback callbackWithOnlyOneOptionalArg = Promise<undefined> (optional any reason);
 
 partial interface TestBinding {
   [Pref="dom.testable_crash.enabled"]