Fix JNI caching for native threads #464
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ktoso
reviewed
Nov 29, 2025
Collaborator
|
Lgtm, we may want to consider making thr init throwing but that may be annoying for now. Class not found do happen and perhaps should not crash the whole process tbh, depending what were tryint to find |
ktoso
approved these changes
Nov 29, 2025
ktoso
reviewed
Dec 1, 2025
| self.javaObjectHolder = nil | ||
| } else { | ||
| // Clear any ClassNotFound exceptions from FindClass | ||
| environment.interface.ExceptionClear(environment) |
ktoso
reviewed
Dec 1, 2025
| /// An optional reference to a java object holder | ||
| /// if we cached this class through the class loader | ||
| /// This is to make sure that the underlying reference remains valid | ||
| nonisolated(unsafe) private let javaObjectHolder: JavaObjectHolder? |
Collaborator
There was a problem hiding this comment.
Why was the nonisolated unsafe necessary actually?
ktoso
added a commit
to ktoso/swift-java
that referenced
this pull request
Dec 4, 2025
Co-authored-by: pelekon <13712101+pelekon@users.noreply.github.com> Co-authored-by: Konrad `ktoso` Malawski <konrad_malawski@apple.com> Co-authored-by: Bartłomiej Bukowiecki <pelekon@users.noreply.github.com> Fix `allowGlobalAutomatic` mode for interfaces (swiftlang#466) Fix JNI caching for native threads (swiftlang#464) fix extensions (swiftlang#473) fix protocols that return java classes. (swiftlang#479)
ktoso
added a commit
that referenced
this pull request
Dec 4, 2025
* config: log-level should encode as string * Properly handle nested directories of Swift Sources in jextract * wip * fix test and cleanup (#1) Co-authored-by: pelekon <13712101+pelekon@users.noreply.github.com> Co-authored-by: Konrad `ktoso` Malawski <konrad_malawski@apple.com> Co-authored-by: Bartłomiej Bukowiecki <pelekon@users.noreply.github.com> Fix `allowGlobalAutomatic` mode for interfaces (#466) Fix JNI caching for native threads (#464) fix extensions (#473) fix protocols that return java classes. (#479) --------- Co-authored-by: Mads Odgaard <mads@madsodgaard.com> Co-authored-by: pelekon <13712101+pelekon@users.noreply.github.com> Co-authored-by: Bartłomiej Bukowiecki <pelekon@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
environment.FindClassdoes not work when ran on native threads, such as is in the case of when we bridgeasyncfunctions. As that function uses the caller class loader (which of course is not the application loader in native threads)Therefore, we need the application class loader in order to cache non-system classes. As recommended in the Android docs, we store the application class loader on
JNI_OnLoad, and use that to reference any classes. We also need thisJNI_OnLoadin the future to fix #419 - so this is a nice start, but this PR does not fix that issue.This is needed to make #462 work