From a7a5d5f4753a759e07a46d73142212a976506d8f Mon Sep 17 00:00:00 2001
From: Konrad Malawski <ktoso@apple.com>
Date: Wed, 12 Nov 2025 11:41:26 +0900
Subject: [PATCH] jextract/jni: use deferEnvironment instead of environment
 interface in defer that's destroying refs to objects

---
 ...wift2JavaGenerator+NativeTranslation.swift |  2 +-
 .../JNI/JNIAsyncTests.swift                   | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift
index 35935038..1994dce0 100644
--- a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift
+++ b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+NativeTranslation.swift
@@ -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 {
diff --git a/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift b/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift
index 975cccc6..1930e601 100644
--- a/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift
+++ b/Tests/JExtractSwiftTests/JNI/JNIAsyncTests.swift
@@ -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()
@@ -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()
@@ -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()
@@ -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()
@@ -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()
@@ -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()
@@ -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()
@@ -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()
@@ -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))])