PR feedback

Author: madsodgaard

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -214,7 +214,7 @@ extension JNISwift2JavaGenerator {
         }
         
         public static \(decl.swiftNominal.name) wrapMemoryAddressUnsafe(long selfPointer) {
-          return new \(decl.swiftNominal.name)(selfPointer, SwiftMemoryManagement.GLOBAL_SWIFT_JAVA_ARENA);
+          return new \(decl.swiftNominal.name)(selfPointer, SwiftMemoryManagement.DEFAULT_SWIFT_JAVA_AUTO_ARENA);
         }
         """
       )
@@ -546,7 +546,7 @@ extension JNISwift2JavaGenerator {
       }
 
       printer.printBraceBlock("\(annotationsStr)\(modifiers.joined(separator: " ")) \(resultType) \(translatedDecl.name)(\(parametersStr))\(throwsClause)") { printer in
-        let globalArenaName = "SwiftMemoryManagement.GLOBAL_SWIFT_JAVA_ARENA"
+        let globalArenaName = "SwiftMemoryManagement.DEFAULT_SWIFT_JAVA_AUTO_ARENA"
         let arguments = translatedDecl.translatedFunctionSignature.parameters.map(\.parameter.name) + [globalArenaName]
         let call = "\(translatedDecl.name)(\(arguments.joined(separator: ", ")))"
         if translatedDecl.translatedFunctionSignature.resultType.javaType.isVoid {

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -162,7 +162,7 @@ extension JNISwift2JavaGenerator {
       // If the underlying translated method requires
       // a SwiftArena, we pass in the global arena
       if translatedDecl.translatedFunctionSignature.requiresSwiftArena {
-        upcallArguments.append("JNI.shared.globalArena")
+        upcallArguments.append("JNI.shared.defaultAutoArena")
       }
 
       let tryClause = function.originalFunctionSignature.isThrowing ? "try " : ""

Sources/SwiftJava/AnyJavaObject.swift

@@ -77,6 +77,11 @@ extension AnyJavaObject {
     return String(seq)
   }
 
+  /// The  mangled name for this java class
+  public static var mangledName: String {
+    "L\(fullJavaClassNameWithSlashes);"
+  }
+
   /// Initialize a Java object from its instance.
   public init(javaThis: jobject, environment: JNIEnvironment) {
     self.init(javaHolder: JavaObjectHolder(object: javaThis, environment: environment))

Sources/SwiftJavaRuntimeSupport/JNI.swift

@@ -15,11 +15,21 @@
 import SwiftJava
 import CSwiftJavaJNI
 
+/// A type that represents the shared JNI environment
+/// used to share any global JNI variables.
+///
+/// This is initialized when the `JNI_OnLoad` is triggered,
+/// which happens when you call `System.loadLibrary(...)`
+/// from Java.
 public final class JNI {
+  /// The shared JNI object, initialized by `JNI_OnLoad`
   public fileprivate(set) static var shared: JNI!
 
+  /// The default application class loader
   public let applicationClassLoader: JavaClassLoader
-  public let globalArena: JavaSwiftArena
+
+  /// The default auto arena of SwiftKitCore
+  public let defaultAutoArena: JavaSwiftArena
 
   init(fromVM javaVM: JavaVirtualMachine) {
     let environment = try! javaVM.environment()
@@ -31,11 +41,11 @@ public final class JNI {
     let arenaFieldID = environment.interface.GetStaticFieldID(
         environment,
         swiftMemoryClass,
-        "GLOBAL_SWIFT_JAVA_ARENA",
-        "Lorg/swift/swiftkit/core/SwiftArena;"
+        "DEFAULT_SWIFT_JAVA_AUTO_ARENA",
+        JavaSwiftArena.mangledName
     )
     let localObject = environment.interface.GetStaticObjectField(environment, swiftMemoryClass, arenaFieldID)!
-    self.globalArena = JavaSwiftArena(javaThis: localObject, environment: environment)
+    self.defaultAutoArena = JavaSwiftArena(javaThis: localObject, environment: environment)
     environment.interface.DeleteLocalRef(environment, localObject)
   }
 }

SwiftKitCore/src/main/java/org/swift/swiftkit/core/SwiftMemoryManagement.java

@@ -15,5 +15,5 @@
 package org.swift.swiftkit.core;
 
 public class SwiftMemoryManagement {
-    public static final SwiftArena GLOBAL_SWIFT_JAVA_ARENA = SwiftArena.ofAuto();
+    public static final SwiftArena DEFAULT_SWIFT_JAVA_AUTO_ARENA = SwiftArena.ofAuto();
 }

Tests/JExtractSwiftTests/JNI/JNIProtocolTests.swift

@@ -307,7 +307,7 @@ struct JNIProtocolTests {
             let cClass = try! JavaClass<JavaSomeClass>(environment: JavaVirtualMachine.shared().environment())
             let cPointer = UnsafeMutablePointer<SomeClass>.allocate(capacity: 1)
             cPointer.initialize(to: c)
-            guard let unwrapped$ = _javaSomeProtocolInterface.withObject(cClass.wrapMemoryAddressUnsafe(Int64(Int(bitPattern: cPointer))), JNI.shared.globalArena) else {
+            guard let unwrapped$ = _javaSomeProtocolInterface.withObject(cClass.wrapMemoryAddressUnsafe(Int64(Int(bitPattern: cPointer))), JNI.shared.defaultAutoArena) else {
               fatalError("Upcall to withObject unexpectedly returned nil")
             }
             let result$MemoryAddress$ = unwrapped$.as(JavaJNISwiftInstance.self)!.memoryAddress()

Tests/JExtractSwiftTests/MemoryManagementModeTests.swift

@@ -63,7 +63,7 @@ struct MemoryManagementModeTests {
       expectedChunks: [
         """
         public static MyClass f() {
-          return f(SwiftMemoryManagement.GLOBAL_SWIFT_JAVA_ARENA);
+          return f(SwiftMemoryManagement.DEFAULT_SWIFT_JAVA_AUTO_ARENA);
         }
         """,
         """
@@ -95,7 +95,7 @@ struct MemoryManagementModeTests {
       expectedChunks: [
         """
         public default MyClass f() {
-          return f(SwiftMemoryManagement.GLOBAL_SWIFT_JAVA_ARENA);
+          return f(SwiftMemoryManagement.DEFAULT_SWIFT_JAVA_AUTO_ARENA);
         }
         """,
         """