Skip to content

jextract/jni: use deferEnvironment instead of environment interface #437

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
merged 1 commit into from
Nov 12, 2025
Merged

jextract/jni: use deferEnvironment instead of environment interface #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ extension JNISwift2JavaGenerator {
// Defer might on any thread, so we need to attach environment.
printer.print("let deferEnvironment = try! JavaVirtualMachine.shared().environment()")
for globalRef in globalRefs {
printer.print("environment.interface.DeleteGlobalRef(deferEnvironment, \(globalRef))")
printer.print("deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, \(globalRef))")
}
}
if isThrowing {
Expand Down
20 changes: 10 additions & 10 deletions Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ struct JNIAsyncTests {
var environment = environment!
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
let swiftResult$ = await SwiftModule.asyncVoid()
environment = try! JavaVirtualMachine.shared().environment()
Expand All @@ -79,7 +79,7 @@ struct JNIAsyncTests {
var environment = try! JavaVirtualMachine.shared().environment()
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
let swiftResult$ = await SwiftModule.asyncVoid()
environment = try! JavaVirtualMachine.shared().environment()
Expand Down Expand Up @@ -140,7 +140,7 @@ struct JNIAsyncTests {
var environment = environment!
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
do {
let swiftResult$ = await try SwiftModule.async()
Expand All @@ -160,7 +160,7 @@ struct JNIAsyncTests {
var environment = try! JavaVirtualMachine.shared().environment()
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
do {
let swiftResult$ = await try SwiftModule.async()
Expand Down Expand Up @@ -228,7 +228,7 @@ struct JNIAsyncTests {
var environment = environment!
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
let swiftResult$ = await SwiftModule.async(i: Int64(fromJNI: i, in: environment))
environment = try! JavaVirtualMachine.shared().environment()
Expand All @@ -242,7 +242,7 @@ struct JNIAsyncTests {
var environment = try! JavaVirtualMachine.shared().environment()
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
let swiftResult$ = await SwiftModule.async(i: Int64(fromJNI: i, in: environment))
environment = try! JavaVirtualMachine.shared().environment()
Expand Down Expand Up @@ -319,7 +319,7 @@ struct JNIAsyncTests {
var environment = environment!
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
let swiftResult$ = await SwiftModule.async(c: c$.pointee)
environment = try! JavaVirtualMachine.shared().environment()
Expand All @@ -336,7 +336,7 @@ struct JNIAsyncTests {
var environment = try! JavaVirtualMachine.shared().environment()
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
}
let swiftResult$ = await SwiftModule.async(c: c$.pointee)
environment = try! JavaVirtualMachine.shared().environment()
Expand Down Expand Up @@ -397,8 +397,8 @@ struct JNIAsyncTests {
...
defer {
let deferEnvironment = try! JavaVirtualMachine.shared().environment()
environment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
environment.interface.DeleteGlobalRef(deferEnvironment, s)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, globalFuture)
deferEnvironment.interface.DeleteGlobalRef(deferEnvironment, s)
}
...
environment.interface.CallBooleanMethodA(environment, globalFuture, _JNIMethodIDCache.CompletableFuture.complete, [jvalue(l: swiftResult$.getJNIValue(in: environment))])
Expand Down
Loading