Skip to content

Fix allowGlobalAutomatic mode for interfaces #466

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
ktoso merged 2 commits into from
Dec 1, 2025
Merged

Fix allowGlobalAutomatic mode for interfaces #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e794a62
fix global arena mode for interfaces
madsodgaard Nov 30, 2025
d7b43d0
add additional codegen test line
madsodgaard Nov 30, 2025
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
13 changes: 12 additions & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,11 @@ extension JNISwift2JavaGenerator {
)
}

private func printJavaBindingWrapperMethod(_ printer: inout CodePrinter, _ decl: ImportedFunc, signaturesOnly: Bool) {
private func printJavaBindingWrapperMethod(
_ printer: inout CodePrinter,
_ decl: ImportedFunc,
signaturesOnly: Bool
) {
guard let translatedDecl = translatedDecl(for: decl) else {
fatalError("Decl was not translated, \(decl)")
}
Expand Down Expand Up @@ -470,6 +474,13 @@ extension JNISwift2JavaGenerator {
if let importedFunc {
printDeclDocumentation(&printer, importedFunc)
}
var modifiers = modifiers

// If we are a protocol, we emit this as default method
if importedFunc?.parentType?.asNominalTypeDeclaration?.kind == .protocol {
modifiers.insert("default", at: 1)
}

printer.printBraceBlock("\(annotationsStr)\(modifiers.joined(separator: " ")) \(resultType) \(translatedDecl.name)(\(parametersStr))\(throwsClause)") { printer in
let globalArenaName = "SwiftMemoryManagement.GLOBAL_SWIFT_JAVA_ARENA"
let arguments = translatedDecl.translatedFunctionSignature.parameters.map(\.parameter.name) + [globalArenaName]
Expand Down
30 changes: 30 additions & 0 deletions Tests/JExtractSwiftTests/MemoryManagementModeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,34 @@ struct MemoryManagementModeTests {
]
)
}

@Test
func allowGlobalAutomatic_protocol() throws {
var config = Configuration()
config.memoryManagementMode = .allowGlobalAutomatic

try assertOutput(
input:
"""
public class MyClass {}

public protocol MyProtocol {
public func f() -> MyClass
}
""",
config: config,
.jni, .java,
detectChunkByInitialLines: 1,
expectedChunks: [
"""
public default MyClass f() {
return f(SwiftMemoryManagement.GLOBAL_SWIFT_JAVA_ARENA);
}
""",
"""
public MyClass f(SwiftArena swiftArena$);
"""
]
)
}
}
Loading