BridgeJS: Remove cleanup logic

Author: kateinoigakukun

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -1243,10 +1243,7 @@ struct StructCodegen {
             printer.write(
                 multilineString: """
                     \(accessControl)init(unsafelyCopying jsObject: JSObject) {
-                        let __bjs_cleanupId = \(lowerFunctionName)(jsObject.bridgeJSLowerParameter())
-                        defer {
-                            _swift_js_struct_cleanup(__bjs_cleanupId)
-                        }
+                        \(lowerFunctionName)(jsObject.bridgeJSLowerParameter())
                         self = Self.bridgeJSStackPop()
                     }
                     """
@@ -1274,7 +1271,7 @@ struct StructCodegen {
             functionName: lowerFunctionName,
             signature: SwiftSignatureBuilder.buildABIFunctionSignature(
                 abiParameters: [("objectId", .i32)],
-                returnType: .i32
+                returnType: nil
             )
         )
         let liftExternDeclPrinter = CodeFragmentPrinter()

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -251,7 +251,6 @@ public struct BridgeJSLink {
             "let \(JSGlueVariableScope.reservedF32Stack) = [];",
             "let \(JSGlueVariableScope.reservedF64Stack) = [];",
             "let \(JSGlueVariableScope.reservedPointerStack) = [];",
-            "let \(JSGlueVariableScope.reservedTmpStructCleanups) = [];",
             "const \(JSGlueVariableScope.reservedEnumHelpers) = {};",
             "const \(JSGlueVariableScope.reservedStructHelpers) = {};",
             "",
@@ -297,6 +296,9 @@ public struct BridgeJSLink {
                     printer.write(
                         "const source = \(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).getObject(sourceId);"
                     )
+                    printer.write(
+                        "\(JSGlueVariableScope.reservedSwift).\(JSGlueVariableScope.reservedMemory).release(sourceId);"
+                    )
                     printer.write(
                         "const bytes = new Uint8Array(\(JSGlueVariableScope.reservedMemory).buffer, bytesPtr);"
                     )
@@ -390,38 +392,13 @@ public struct BridgeJSLink {
                     printer.write("return \(JSGlueVariableScope.reservedPointerStack).pop();")
                 }
                 printer.write("}")
-                printer.write("bjs[\"swift_js_struct_cleanup\"] = function(cleanupId) {")
-                printer.indent {
-                    printer.write("if (cleanupId === 0) { return; }")
-                    printer.write("const index = (cleanupId | 0) - 1;")
-                    printer.write("const cleanup = \(JSGlueVariableScope.reservedTmpStructCleanups)[index];")
-                    printer.write("\(JSGlueVariableScope.reservedTmpStructCleanups)[index] = null;")
-                    printer.write("if (cleanup) { cleanup(); }")
-                    printer.write(
-                        "while (\(JSGlueVariableScope.reservedTmpStructCleanups).length > 0 && \(JSGlueVariableScope.reservedTmpStructCleanups)[\(JSGlueVariableScope.reservedTmpStructCleanups).length - 1] == null) {"
-                    )
-                    printer.indent {
-                        printer.write("\(JSGlueVariableScope.reservedTmpStructCleanups).pop();")
-                    }
-                    printer.write("}")
-                }
-                printer.write("}")
-
                 if !allStructs.isEmpty {
                     for structDef in allStructs {
                         printer.write("bjs[\"swift_js_struct_lower_\(structDef.name)\"] = function(objectId) {")
                         printer.indent {
                             printer.write(
-                                "const { cleanup: cleanup } = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));"
+                                "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));"
                             )
-                            printer.write("if (cleanup) {")
-                            printer.indent {
-                                printer.write(
-                                    "return \(JSGlueVariableScope.reservedTmpStructCleanups).push(cleanup);"
-                                )
-                            }
-                            printer.write("}")
-                            printer.write("return 0;")
                         }
                         printer.write("}")
 
@@ -943,14 +920,12 @@ public struct BridgeJSLink {
             for structDef in allStructs {
                 let structPrinter = CodeFragmentPrinter()
                 let structScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
-                let structCleanup = CodeFragmentPrinter()
                 let fragment = IntrinsicJSFragment.structHelper(structDefinition: structDef, allStructs: allStructs)
                 _ = try fragment.printCode(
                     [structDef.name],
                     IntrinsicJSFragment.PrintCodeContext(
                         scope: structScope,
-                        printer: structPrinter,
-                        cleanupCode: structCleanup
+                        printer: structPrinter
                     )
                 )
                 bodyPrinter.write(lines: structPrinter.lines)
@@ -962,14 +937,12 @@ public struct BridgeJSLink {
             for enumDef in allAssocEnums {
                 let enumPrinter = CodeFragmentPrinter()
                 let enumScope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
-                let enumCleanup = CodeFragmentPrinter()
                 let fragment = IntrinsicJSFragment.associatedValueEnumHelperFactory(enumDefinition: enumDef)
                 _ = try fragment.printCode(
                     [enumDef.valuesName],
                     IntrinsicJSFragment.PrintCodeContext(
                         scope: enumScope,
-                        printer: enumPrinter,
-                        cleanupCode: enumCleanup
+                        printer: enumPrinter
                     )
                 )
                 bodyPrinter.write(lines: enumPrinter.lines)
@@ -1214,7 +1187,6 @@ public struct BridgeJSLink {
 
     class ExportedThunkBuilder {
         var body: CodeFragmentPrinter
-        var cleanupCode: CodeFragmentPrinter
         var parameterForwardings: [String] = []
         let effects: Effects
         let scope: JSGlueVariableScope
@@ -1224,11 +1196,9 @@ public struct BridgeJSLink {
             self.effects = effects
             self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
             self.body = CodeFragmentPrinter()
-            self.cleanupCode = CodeFragmentPrinter()
             self.context = IntrinsicJSFragment.PrintCodeContext(
                 scope: scope,
                 printer: body,
-                cleanupCode: cleanupCode,
                 hasDirectAccessToSwiftClass: hasDirectAccessToSwiftClass
             )
         }
@@ -1302,7 +1272,6 @@ public struct BridgeJSLink {
         /// Renders the thunk body (body code, cleanup, exception handling, and optional return) into a printer.
         func renderFunctionBody(into printer: CodeFragmentPrinter, returnExpr: String?) {
             printer.write(contentsOf: body)
-            printer.write(contentsOf: cleanupCode)
             printer.write(lines: checkExceptionLines())
             if let returnExpr = returnExpr {
                 printer.write("return \(returnExpr);")
@@ -1528,8 +1497,7 @@ public struct BridgeJSLink {
         let printer = CodeFragmentPrinter()
         let context = IntrinsicJSFragment.PrintCodeContext(
             scope: scope,
-            printer: printer,
-            cleanupCode: CodeFragmentPrinter()
+            printer: printer
         )
         let enumValuesName = enumDefinition.valuesName
 
@@ -2114,7 +2082,6 @@ extension BridgeJSLink {
     class ImportedThunkBuilder {
         let body: CodeFragmentPrinter
         let scope: JSGlueVariableScope
-        let cleanupCode: CodeFragmentPrinter
         let context: BridgeContext
         var parameterNames: [String] = []
         var parameterForwardings: [String] = []
@@ -2123,12 +2090,10 @@ extension BridgeJSLink {
         init(context: BridgeContext = .importTS, intrinsicRegistry: JSIntrinsicRegistry) {
             self.body = CodeFragmentPrinter()
             self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
-            self.cleanupCode = CodeFragmentPrinter()
             self.context = context
             self.printContext = IntrinsicJSFragment.PrintCodeContext(
                 scope: scope,
-                printer: body,
-                cleanupCode: cleanupCode
+                printer: body
             )
         }
 
@@ -2667,7 +2632,6 @@ extension BridgeJSLink {
                 getterPrinter.write("get \(property.name)() {")
                 getterPrinter.indent {
                     getterPrinter.write(contentsOf: getterThunkBuilder.body)
-                    getterPrinter.write(contentsOf: getterThunkBuilder.cleanupCode)
                     getterPrinter.write(lines: getterThunkBuilder.checkExceptionLines())
                     if let returnExpr = getterReturnExpr {
                         getterPrinter.write("return \(returnExpr);")
@@ -2695,7 +2659,6 @@ extension BridgeJSLink {
                     setterPrinter.write("set \(property.name)(value) {")
                     setterPrinter.indent {
                         setterPrinter.write(contentsOf: setterThunkBuilder.body)
-                        setterPrinter.write(contentsOf: setterThunkBuilder.cleanupCode)
                         setterPrinter.write(lines: setterThunkBuilder.checkExceptionLines())
                     }
                     setterPrinter.write("},")