NFC: BridgeJS: Reduce retained object cleanup warning noise in BridgeJS glue

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -3040,16 +3040,7 @@ struct IntrinsicJSFragment: Sendable {
                     }
                     printer.write("}")
                     scope.emitPushI32Parameter("\(idVar) !== undefined ? \(idVar) : 0", printer: printer)
-                    cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {")
-                    cleanup.indent {
-                        cleanup.write("try {")
-                        cleanup.indent {
-                            cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));")
-                            cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));")
-                        }
-                        cleanup.write("} catch(e) {}")
-                    }
-                    cleanup.write("}")
+                    emitRetainedObjectCleanup(idVar: idVar, into: cleanup)
                     return [idVar]
                 }
             )
@@ -3208,16 +3199,7 @@ struct IntrinsicJSFragment: Sendable {
                         }
                         printer.write("}")
                         scope.emitPushI32Parameter("\(isSomeVar) ? 1 : 0", printer: printer)
-                        cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {")
-                        cleanup.indent {
-                            cleanup.write("try {")
-                            cleanup.indent {
-                                cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));")
-                                cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));")
-                            }
-                            cleanup.write("} catch(e) {}")
-                        }
-                        cleanup.write("}")
+                        emitRetainedObjectCleanup(idVar: idVar, into: cleanup)
                         return [idVar]
                     } else {
                         switch wrappedType {
@@ -3364,6 +3346,18 @@ struct IntrinsicJSFragment: Sendable {
         }
     }
 
+    private static func emitRetainedObjectCleanup(idVar: String, into cleanup: CodeFragmentPrinter) {
+        cleanup.write("if(\(idVar) !== undefined && \(idVar) !== 0) {")
+        cleanup.indent {
+            cleanup.write("try {")
+            cleanup.indent {
+                cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));")
+            }
+            cleanup.write("} catch(e) {}")
+        }
+        cleanup.write("}")
+    }
+
     /// Helper to push optional primitive values to stack-based parameters
     private static func pushOptionalPrimitive(
         value: String,

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js

@@ -52,13 +52,11 @@ export async function createInstantiator(options, swift) {
                 const cleanup = () => {
                     if(id !== undefined && id !== 0) {
                         try {
-                            swift.memory.getObject(id);
                             swift.memory.release(id);
                         } catch(e) {}
                     }
                     if(id1 !== undefined && id1 !== 0) {
                         try {
-                            swift.memory.getObject(id1);
                             swift.memory.release(id1);
                         } catch(e) {}
                     }

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js

@@ -246,13 +246,11 @@ export async function createInstantiator(options, swift) {
                 const cleanup = () => {
                     if(id !== undefined && id !== 0) {
                         try {
-                            swift.memory.getObject(id);
                             swift.memory.release(id);
                         } catch(e) {}
                     }
                     if(id1 !== undefined && id1 !== 0) {
                         try {
-                            swift.memory.getObject(id1);
                             swift.memory.release(id1);
                         } catch(e) {}
                     }