BridgeJS: Remove LiftingIntrinsicInfo wrapper and add console.warn for cleanup failures

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift

@@ -123,16 +123,16 @@ public struct ClosureCodegen {
 
         for (index, paramType) in signature.parameters.enumerated() {
             let paramName = "param\(index)"
-            let liftInfo = try paramType.liftParameterInfo()
+            let liftParams = try paramType.liftParameterInfo()
 
-            for (argName, wasmType) in liftInfo.parameters {
+            for (argName, wasmType) in liftParams {
                 let fullName =
-                    liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName
+                    liftParams.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName
                 abiParams.append((fullName, wasmType))
             }
 
-            let argNames = liftInfo.parameters.map { (argName, _) in
-                liftInfo.parameters.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName
+            let argNames = liftParams.map { (argName, _) in
+                liftParams.count > 1 ? "\(paramName)\(argName.capitalizedFirstLetter)" : paramName
             }
             liftedParams.append("\(paramType.swiftType).bridgeJSLiftParameter(\(argNames.joined(separator: ", ")))")
         }

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -119,12 +119,12 @@ public class ExportSwift {
 
         func liftParameter(param: Parameter) throws {
             parameters.append(param)
-            let liftingInfo = try param.type.liftParameterInfo()
+            let liftingParams = try param.type.liftParameterInfo()
             let argumentsToLift: [String]
-            if liftingInfo.parameters.count == 1 {
+            if liftingParams.count == 1 {
                 argumentsToLift = [param.name]
             } else {
-                argumentsToLift = liftingInfo.parameters.map { (name, _) in param.name + name.capitalizedFirstLetter }
+                argumentsToLift = liftingParams.map { (name, _) in param.name + name.capitalizedFirstLetter }
             }
 
             let typeNameForIntrinsic: String
@@ -160,7 +160,7 @@ public class ExportSwift {
             }
 
             liftedParameterExprs.append(liftingExpr)
-            for (name, type) in zip(argumentsToLift, liftingInfo.parameters.map { $0.type }) {
+            for (name, type) in zip(argumentsToLift, liftingParams.map { $0.type }) {
                 abiParameterSignatures.append((name, type))
             }
         }
@@ -1568,25 +1568,20 @@ extension BridgeType {
         return false
     }
 
-    struct LiftingIntrinsicInfo: Sendable {
-        let parameters: [(name: String, type: WasmCoreType)]
-
-    }
-
-    func liftParameterInfo() throws -> LiftingIntrinsicInfo {
+    func liftParameterInfo() throws -> [(name: String, type: WasmCoreType)] {
         switch self {
         case .nullable(let wrappedType, _):
-            let wrappedInfo = try wrappedType.liftParameterInfo()
-            if wrappedInfo.parameters.isEmpty {
-                return LiftingIntrinsicInfo(parameters: [])
+            let wrappedParams = try wrappedType.liftParameterInfo()
+            if wrappedParams.isEmpty {
+                return []
             }
             var optionalParams: [(name: String, type: WasmCoreType)] = [("isSome", .i32)]
-            optionalParams.append(contentsOf: wrappedInfo.parameters)
-            return LiftingIntrinsicInfo(parameters: optionalParams)
+            optionalParams.append(contentsOf: wrappedParams)
+            return optionalParams
         case .namespaceEnum:
             throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters")
         default:
-            return LiftingIntrinsicInfo(parameters: descriptor.wasmParams)
+            return descriptor.wasmParams
         }
     }
 

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -2819,7 +2819,7 @@ struct IntrinsicJSFragment: Sendable {
                             cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.getObject(\(idVar));")
                             cleanup.write("\(JSGlueVariableScope.reservedSwift).memory.release(\(idVar));")
                         }
-                        cleanup.write("} catch(e) {}")
+                        cleanup.write("} catch(e) { console.warn('BridgeJS: cleanup failed for retained object', e); }")
                     }
                     cleanup.write("}")
                     return [idVar]

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

@@ -54,7 +54,7 @@ export async function createInstantiator(options, swift) {
                             try {
                                 swift.memory.getObject(id1);
                                 swift.memory.release(id1);
-                            } catch(e) {}
+                            } catch(e) { console.warn('BridgeJS: cleanup failed for retained object', e); }
                         }
                     };
                 } else {
@@ -66,7 +66,7 @@ export async function createInstantiator(options, swift) {
                         try {
                             swift.memory.getObject(id);
                             swift.memory.release(id);
-                        } catch(e) {}
+                        } catch(e) { console.warn('BridgeJS: cleanup failed for retained object', e); }
                     }
                     if (innerCleanup) { innerCleanup(); }
                 };

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

@@ -251,7 +251,7 @@ export async function createInstantiator(options, swift) {
                             try {
                                 swift.memory.getObject(id1);
                                 swift.memory.release(id1);
-                            } catch(e) {}
+                            } catch(e) { console.warn('BridgeJS: cleanup failed for retained object', e); }
                         }
                     };
                 } else {
@@ -263,7 +263,7 @@ export async function createInstantiator(options, swift) {
                         try {
                             swift.memory.getObject(id);
                             swift.memory.release(id);
-                        } catch(e) {}
+                        } catch(e) { console.warn('BridgeJS: cleanup failed for retained object', e); }
                     }
                     if (innerCleanup) { innerCleanup(); }
                 };