Skip to content

jextract/jni: Fix label-based overloading for JNI #742

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
May 13, 2026
Merged

jextract/jni: Fix label-based overloading for JNI #742

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
77607a1
Add example of JNI overloads
sidepelican May 11, 2026
e2a2458
Fix labeled overloading not detected
sidepelican May 13, 2026
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
12 changes: 12 additions & 0 deletions Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/MySwiftLibrary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,18 @@ public func returnLargestUnsignedByte() -> UInt8 {
UInt8.max
}

public func globalOverloaded(a: Int) -> Int {
a + 1
}

public func globalOverloaded(b: Int) -> Int {
b + 2
}

public func globalOverloaded(_ c: Int) -> Int {
c + 3
}

// ==== Internal helpers

func p(_ msg: String, file: String = #fileID, line: UInt = #line, function: String = #function) {
Expand Down
9 changes: 8 additions & 1 deletion Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,11 @@ void returnUnsignedByte_negative() {
void returnLargestUnsignedByte() {
assertEquals(-1, MySwiftLibrary.returnLargestUnsignedByte());
}
}

@Test
void labeledOverloads() {
assertEquals(101, MySwiftLibrary.globalOverloadedA(100));
assertEquals(202, MySwiftLibrary.globalOverloadedB(200));
assertEquals(303, MySwiftLibrary.globalOverloaded(300));
}
}
9 changes: 8 additions & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,10 @@ extension JNISwift2JavaGenerator {
private func printGlobalSwiftThunkSources(_ printer: inout CodePrinter) throws {
printHeader(&printer)

self.currentJavaIdentifiers = JavaIdentifierFactory(
self.analysis.importedGlobalFuncs + self.analysis.importedGlobalVariables
)

for decl in analysis.importedGlobalFuncs {
printSwiftFunctionThunk(&printer, decl)
printer.println()
Expand All @@ -290,9 +294,12 @@ extension JNISwift2JavaGenerator {

private func printNominalTypeThunks(_ printer: inout CodePrinter, _ type: ImportedNominalType) throws {
printHeader(&printer)

printer.println()

self.currentJavaIdentifiers = JavaIdentifierFactory(
type.initializers + type.variables + type.methods
)

switch type.swiftNominal.kind {
case .actor, .class, .enum, .struct:
printConcreteTypeThunks(&printer, type)
Expand Down
Loading