Skip to content

## Fix Swift overloads producing uncompilable Java wrappers #544

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

Open
Clemo97 wants to merge 3 commits into
base: main
Choose a base branch
from
+28 −15
Open

## Fix Swift overloads producing uncompilable Java wrappers #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
433ae80
Append parameter labels to Java method names for overload disambiguation
Clemo97 Jan 26, 2026
b815641
Merge branch 'swiftlang:main' into main
Clemo97 Jan 30, 2026
77bac33
Merge branch 'swiftlang:main' into main
Clemo97 Feb 2, 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
28 changes: 14 additions & 14 deletions Samples/SwiftJavaExtractFFMSampleApp/src/main/java/com/example/swift/HelloJava2Swift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ public static void main(String[] args) {
static void examples() {
MySwiftLibrary.helloWorld();

MySwiftLibrary.globalTakeInt(1337);
MySwiftLibrary.globalTakeInt_i(1337);

long cnt = MySwiftLibrary.globalWriteString("String from Java");
long cnt = MySwiftLibrary.globalWriteString_string("String from Java");

CallTraces.trace("count = " + cnt);

MySwiftLibrary.globalCallMeRunnable(() -> {
MySwiftLibrary.globalCallMeRunnable_run(() -> {
CallTraces.trace("running runnable");
});

Expand All @@ -55,7 +55,7 @@ static void examples() {

// Example of using an arena; MyClass.deinit is run at end of scope
try (var arena = AllocatingSwiftArena.ofConfined()) {
MySwiftClass obj = MySwiftClass.init(2222, 7777, arena);
MySwiftClass obj = MySwiftClass.init_len_cap(2222, 7777, arena);

// just checking retains/releases work
CallTraces.trace("retainCount = " + SwiftRuntime.retainCount(obj));
Expand All @@ -68,36 +68,36 @@ static void examples() {
CallTraces.trace("obj.counter = " + obj.getCounter());

obj.voidMethod();
obj.takeIntMethod(42);
obj.takeIntMethod_i(42);

MySwiftClass otherObj = MySwiftClass.factory(12, 42, arena);
MySwiftClass otherObj = MySwiftClass.factory_len_cap(12, 42, arena);
otherObj.voidMethod();

MySwiftStruct swiftValue = MySwiftStruct.init(2222, 1111, arena);
MySwiftStruct swiftValue = MySwiftStruct.init_cap_len(2222, 1111, arena);
CallTraces.trace("swiftValue.capacity = " + swiftValue.getCapacity());
swiftValue.withCapLen((cap, len) -> {
swiftValue.withCapLen__((cap, len) -> {
CallTraces.trace("withCapLenCallback: cap=" + cap + ", len=" + len);
});
}

// Example of using 'Data'.
try (var arena = AllocatingSwiftArena.ofConfined()) {
var origBytes = arena.allocateFrom("foobar");
var origDat = Data.init(origBytes, origBytes.byteSize(), arena);
var origDat = Data.init_bytes_count(origBytes, origBytes.byteSize(), arena);
CallTraces.trace("origDat.count = " + origDat.getCount());

var retDat = MySwiftLibrary.globalReceiveReturnData(origDat, arena);
retDat.withUnsafeBytes((retBytes) -> {
var retDat = MySwiftLibrary.globalReceiveReturnData_data(origDat, arena);
retDat.withUnsafeBytes__((retBytes) -> {
var str = retBytes.getString(0);
CallTraces.trace("retStr=" + str);
});
}

try (var arena = AllocatingSwiftArena.ofConfined()) {
var bytes = arena.allocateFrom("hello");
var dat = Data.init(bytes, bytes.byteSize(), arena);
MySwiftLibrary.globalReceiveSomeDataProtocol(dat);
MySwiftLibrary.globalReceiveOptional(OptionalLong.of(12), Optional.of(dat));
var dat = Data.init_bytes_count(bytes, bytes.byteSize(), arena);
MySwiftLibrary.globalReceiveSomeDataProtocol_data(dat);
MySwiftLibrary.globalReceiveOptional_o1_o2(OptionalLong.of(12), Optional.of(dat));
}


Expand Down
15 changes: 14 additions & 1 deletion Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,24 @@ extension FFMSwift2JavaGenerator {
let loweredSignature = try lowering.lowerFunctionSignature(decl.functionSignature)

// Name.
let javaName = switch decl.apiKind {
let baseName = switch decl.apiKind {
case .getter, .subscriptGetter: decl.javaGetterName
case .setter, .subscriptSetter: decl.javaSetterName
case .function, .initializer, .enumCase: decl.name
}

// Add parameter labels to make method names unique (for overloading support)
let suffix: String
switch decl.apiKind {
case .getter, .subscriptGetter, .setter, .subscriptSetter:
suffix = ""
default:
suffix = decl.functionSignature.parameters
.map { "_" + ($0.argumentLabel ?? "_") }
.joined()
}

let javaName = baseName + suffix

// Signature.
let translatedSignature = try translate(loweredFunctionSignature: loweredSignature, methodName: javaName)
Expand Down