Skip to content

Fix Int? argument issues on 32-bit environments #667

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
sidepelican wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix Int? argument issues on 32-bit environments #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9c121e
Use fixed width Int.JNIType
sidepelican Apr 1, 2026
38fe60c
Update test fixtures
sidepelican Apr 1, 2026
cb6a2bc
Remove redundant Int64 convertion
sidepelican Apr 1, 2026
2f9a97a
insert parameter overflow checking when optional pattern
sidepelican Apr 1, 2026
e8555c7
Merge remote-tracking branch 'origin/main' into fixed_witdh_Int
sidepelican Apr 1, 2026
3483821
Apply fix to merged codebase
sidepelican Apr 1, 2026
bd8b411
Revert package.swift updates
sidepelican Apr 1, 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
4 changes: 4 additions & 0 deletions Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/Optionals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ public func optionalLong(input: Int64?) -> Int64? {
input
}

public func optionalPlatformDependentInt(input: Int?) -> Int? {
input
}

public func optionalFloat(input: Float?) -> Float? {
input
}
Expand Down
8 changes: 7 additions & 1 deletion Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/OptionalsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ void optionalLong() {
assertEquals(OptionalLong.of(999), MySwiftLibrary.optionalLong(OptionalLong.of(999)));
}

@Test
void optionalPlatformDependentInt() {
assertEquals(OptionalLong.empty(), MySwiftLibrary.optionalPlatformDependentInt(OptionalLong.empty()));
assertEquals(OptionalLong.of(123), MySwiftLibrary.optionalPlatformDependentInt(OptionalLong.of(123)));
}

@Test
void optionalFloat() {
assertEquals(Optional.empty(), MySwiftLibrary.optionalFloat(Optional.empty()));
Expand Down Expand Up @@ -143,4 +149,4 @@ void optionalThrows() {
assertEquals("swiftError", exception.getMessage());
}
}
}
}
36 changes: 5 additions & 31 deletions Sources/JExtractSwiftLib/JNI/JNIJavaTypeTranslator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,40 +58,14 @@ enum JNIJavaTypeTranslator {
}
}

static func indirectConversionStepSwiftType(
for knownKind: SwiftKnownTypeDeclKind,
from knownTypes: SwiftKnownTypes
) -> SwiftType? {
switch knownKind {
case .int: knownTypes.int64
case .uint: knownTypes.uint64

case .bool, .int8, .uint8, .int16, .uint16, .int32, .uint32, .int64, .uint64,
.float, .double, .void, .string,
.unsafeRawPointer, .unsafeMutableRawPointer,
.unsafePointer, .unsafeMutablePointer,
.unsafeRawBufferPointer, .unsafeMutableRawBufferPointer,
.unsafeBufferPointer, .unsafeMutableBufferPointer,
.optional,
.foundationData, .foundationDataProtocol,
.essentialsData, .essentialsDataProtocol,
.array,
.dictionary,
.set,
.foundationDate, .essentialsDate,
.foundationUUID, .essentialsUUID,
.swiftJavaError:
nil
}
}

static func checkStep(
for knownKind: SwiftKnownTypeDeclKind,
parameterType: SwiftKnownTypeDeclKind,
parameterName: String,
from knownTypes: SwiftKnownTypes
) -> JNISwift2JavaGenerator.NativeSwiftConversionCheck? {
switch knownKind {
case .int: .check32BitIntOverflow(typeWithMinAndMax: knownTypes.int32)
case .uint: .check32BitIntOverflow(typeWithMinAndMax: knownTypes.uint32)
switch parameterType {
case .int: .check32BitIntOverflow(parameterName: parameterName, typeWithMinAndMax: knownTypes.int32)
case .uint: .check32BitIntOverflow(parameterName: parameterName, typeWithMinAndMax: knownTypes.uint32)

case .bool, .int8, .uint8, .int16, .uint16, .int32, .uint32, .int64, .uint64,
.float, .double, .void, .string,
Expand Down
2 changes: 0 additions & 2 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,13 @@ extension JNISwift2JavaGenerator {
selfParameter: NativeParameter(
parameters: [JavaParameter(name: "selfPointer", type: .long)],
conversion: .extractSwiftValue(.placeholder, swiftType: .nominal(enumCase.enumType), allowNil: false),
indirectConversion: nil,
conversionCheck: nil,
),
selfTypeParameter: !isGenericParent
? nil
: .init(
parameters: [JavaParameter(name: "selfTypePointer", type: .long)],
conversion: .extractMetatypeValue(.placeholder),
indirectConversion: nil,
conversionCheck: nil,
),
parameters: [],
Expand Down
Loading
Loading