Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kateinoigakukun merged 1 commit into from
Feb 14, 2026
+3 −51
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3026,7 +3026,7 @@ struct IntrinsicJSFragment: Sendable {
return IntrinsicJSFragment(
parameters: ["value"],
printCode: { arguments, context in
let (scope, printer, cleanup) = (context.scope, context.printer, context.cleanupCode)
let (scope, printer) = (context.scope, context.printer)
let value = arguments[0]
let idVar = scope.variable("id")
printer.write("let \(idVar);")
Expand All @@ -3040,16 +3040,6 @@ 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("}")
return [idVar]
}
)
Expand Down Expand Up @@ -3208,16 +3198,6 @@ 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("}")
return [idVar]
} else {
switch wrappedType {
Expand Down
16 changes: 1 addition & 15 deletions ...ests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ImportedTypeInExportedInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,7 @@ export async function createInstantiator(options, swift) {
i32Stack.push(0);
}
i32Stack.push(isSome ? 1 : 0);
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) {}
}
};
return { cleanup };
return { cleanup: undefined };
},
lift: () => {
const isSome = i32Stack.pop();
Expand Down
16 changes: 1 addition & 15 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,21 +243,7 @@ export async function createInstantiator(options, swift) {
i32Stack.push(0);
}
i32Stack.push(isSome ? 1 : 0);
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) {}
}
};
return { cleanup };
return { cleanup: undefined };
},
lift: () => {
const isSome = i32Stack.pop();
Expand Down