remove swiftjavaerror special handling from swiftextract

Author: ktoso

Sources/JExtractSwiftLib/FFM/CDeclLowering/FFMSwift2JavaGenerator+FunctionLowering.swift

@@ -365,10 +365,6 @@ struct CdeclLowering {
         case .foundationData, .essentialsData:
           break
 
-        case .swiftJavaError:
-          // SwiftJavaError is a class — treat as arbitrary nominal type below
-          break
-
         default:
           // Unreachable? Should be handled by `CType(cdeclType:)` lowering above.
           throw LoweringError.unhandledType(type)

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift

@@ -18,7 +18,7 @@ import SwiftJavaJNICore
 
 extension FFMSwift2JavaGenerator {
   func translatedDecl(
-    for decl: ImportedFunc
+    for decl: ExtractedFunc
   ) -> TranslatedFunctionDecl? {
     if let cached = translatedDecls[decl] {
       return cached
@@ -176,7 +176,7 @@ extension FFMSwift2JavaGenerator {
       self.javaIdentifiers = javaIdentifiers
     }
 
-    func translate(_ decl: ImportedFunc) throws -> TranslatedFunctionDecl {
+    func translate(_ decl: ExtractedFunc) throws -> TranslatedFunctionDecl {
       let lowering = CdeclLowering(knownTypes: knownTypes)
       let loweredSignature = try lowering.lowerFunctionSignature(decl.functionSignature)
 
@@ -451,10 +451,6 @@ extension FFMSwift2JavaGenerator {
           case .foundationData, .essentialsData:
             break
 
-          case .swiftJavaError:
-            // SwiftJavaError is a class — treat as arbitrary nominal type below
-            break
-
           default:
             throw JavaTranslationError.unhandledType(swiftType)
           }

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift

@@ -38,7 +38,7 @@ package class FFMSwift2JavaGenerator: Swift2JavaGenerator {
   var thunkNameRegistry: ThunkNameRegistry = ThunkNameRegistry()
 
   /// Cached Java translation result. 'nil' indicates failed translation.
-  var translatedDecls: [ImportedFunc: TranslatedFunctionDecl?] = [:]
+  var translatedDecls: [ExtractedFunc: TranslatedFunctionDecl?] = [:]
 
   /// Duplicate identifier tracking for the current batch of methods being generated.
   var currentJavaIdentifiers: JavaIdentifierFactory = JavaIdentifierFactory()
@@ -152,8 +152,8 @@ extension FFMSwift2JavaGenerator {
   ]
 
   /// Returns the Java class name for a nominal type, applying known-type overrides
-  func javaClassName(for decl: ImportedNominalType) -> String {
-    if decl.swiftNominal.knownTypeKind == .swiftJavaError {
+  func javaClassName(for decl: ExtractedNominalType) -> String {
+    if decl.swiftNominal.isSwiftJavaErrorType {
       return JavaType.swiftJavaErrorException.className!
     }
     return decl.swiftNominal.name
@@ -171,13 +171,13 @@ extension FFMSwift2JavaGenerator {
 
   /// Every imported public type becomes a public class in its own file in Java.
   package func writeExportedJavaSources(printer: inout CodePrinter) throws {
-    let typesToExport: [(key: String, value: ImportedNominalType)]
+    let typesToExport: [(key: String, value: ExtractedNominalType)]
     if let singleType = config.singleType {
-      typesToExport = analysis.importedTypes
+      typesToExport = analysis.extractedTypes
         .filter { $0.key == singleType }
         .sorted(by: { $0.key < $1.key })
     } else {
-      typesToExport = analysis.importedTypes
+      typesToExport = analysis.extractedTypes
         .sorted(by: { $0.key < $1.key })
     }
 
@@ -227,24 +227,24 @@ extension FFMSwift2JavaGenerator {
     printImports(&printer)
 
     self.currentJavaIdentifiers = JavaIdentifierFactory(
-      self.analysis.importedGlobalFuncs + self.analysis.importedGlobalVariables
+      self.analysis.extractedGlobalFuncs + self.analysis.extractedGlobalVariables
     )
 
     printModuleClass(&printer) { printer in
 
-      for decl in analysis.importedGlobalVariables {
+      for decl in analysis.extractedGlobalVariables {
         self.log.trace("Print imported decl: \(decl)")
         printFunctionDowncallMethods(&printer, decl)
       }
 
-      for decl in analysis.importedGlobalFuncs {
+      for decl in analysis.extractedGlobalFuncs {
         self.log.trace("Print imported decl: \(decl)")
         printFunctionDowncallMethods(&printer, decl)
       }
     }
   }
 
-  func printImportedNominal(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
+  func printImportedNominal(_ printer: inout CodePrinter, _ decl: ExtractedNominalType) {
     printHeader(&printer)
     printPackage(&printer)
     printImports(&printer) // TODO: we could have some imports be driven from types used in the generated decl
@@ -253,7 +253,7 @@ extension FFMSwift2JavaGenerator {
       decl.initializers + decl.variables + decl.methods
     )
 
-    let isErrorType = decl.swiftNominal.knownTypeKind == .swiftJavaError
+    let isErrorType = decl.swiftNominal.isSwiftJavaErrorType
     self.currentSymbolLookup = isErrorType ? .swiftRuntime : .module
 
     printNominal(&printer, decl) { printer in
@@ -387,10 +387,10 @@ extension FFMSwift2JavaGenerator {
 
   func printNominal(
     _ printer: inout CodePrinter,
-    _ decl: ImportedNominalType,
+    _ decl: ExtractedNominalType,
     body: (inout CodePrinter) -> Void,
   ) {
-    let isErrorType = decl.swiftNominal.knownTypeKind == .swiftJavaError
+    let isErrorType = decl.swiftNominal.isSwiftJavaErrorType
 
     let baseClass: String
     let parentProtocol: String
@@ -425,8 +425,8 @@ extension FFMSwift2JavaGenerator {
 
   /// Returns a closure that prints the constructor and related extras for special nominal types
   /// (e.g. error types), or `nil` for normal types that use the default layout + constructor
-  func getSpecialNominalConstructorPrinting(_ decl: ImportedNominalType) -> ((inout CodePrinter) -> Void)? {
-    if decl.swiftNominal.knownTypeKind == .swiftJavaError {
+  func getSpecialNominalConstructorPrinting(_ decl: ExtractedNominalType) -> ((inout CodePrinter) -> Void)? {
+    if decl.swiftNominal.isSwiftJavaErrorType {
       return { printer in
         // Error constructor: wrap the opaque pointer so it becomes a pointer-to-reference
         // (matching the convention used by normal class instance thunks)
@@ -449,8 +449,8 @@ extension FFMSwift2JavaGenerator {
 
   /// Returns a closure that prints post-members extras for special nominal types
   /// (e.g. `fetchDescription` for error types), or `nil` for normal types that use `toString()`
-  func getSpecialNominalPostMembersPrinting(_ decl: ImportedNominalType) -> ((inout CodePrinter) -> Void)? {
-    if decl.swiftNominal.knownTypeKind == .swiftJavaError {
+  func getSpecialNominalPostMembersPrinting(_ decl: ExtractedNominalType) -> ((inout CodePrinter) -> Void)? {
+    if decl.swiftNominal.isSwiftJavaErrorType {
       return { printer in
         // Error types inherit toString() from Exception; print fetchDescription helper instead
         self.printSwiftJavaErrorFetchDescriptionMethod(&printer, decl)
@@ -569,7 +569,7 @@ extension FFMSwift2JavaGenerator {
     )
   }
 
-  private func printClassMemoryLayout(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
+  private func printClassMemoryLayout(_ printer: inout CodePrinter, _ decl: ExtractedNominalType) {
     printer.print(
       """
       public static final GroupLayout $LAYOUT = (GroupLayout) SwiftValueWitnessTable.layoutOfSwiftType(TYPE_METADATA.$memorySegment());
@@ -582,7 +582,7 @@ extension FFMSwift2JavaGenerator {
 
   func printToStringMethod(
     _ printer: inout CodePrinter,
-    _ decl: ImportedNominalType,
+    _ decl: ExtractedNominalType,
   ) {
     printer.print(
       """
@@ -599,7 +599,7 @@ extension FFMSwift2JavaGenerator {
   }
 
   /// Print special helper methods for known types like Foundation.Data
-  func printSpecificTypeHelpers(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
+  func printSpecificTypeHelpers(_ printer: inout CodePrinter, _ decl: ExtractedNominalType) {
     guard let knownType = decl.swiftNominal.knownTypeKind else {
       return
     }
@@ -615,7 +615,7 @@ extension FFMSwift2JavaGenerator {
   /// Print the `fetchDescription` static helper for SwiftJavaError.
   /// This calls the `errorDescription()` downcall to get the error message
   /// for the super constructor
-  func printSwiftJavaErrorFetchDescriptionMethod(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
+  func printSwiftJavaErrorFetchDescriptionMethod(_ printer: inout CodePrinter, _ decl: ExtractedNominalType) {
     // Find the errorDescription method's thunk name
     let errorDescMethod = decl.methods.first { $0.name == "errorDescription" }
     guard let errorDescMethod, let _ = translatedDecl(for: errorDescMethod) else {

Sources/JExtractSwiftLib/JNI/JNIJavaTypeTranslator.swift

@@ -53,8 +53,7 @@ enum JNIJavaTypeTranslator {
       .dictionary,
       .set,
       .foundationDate, .essentialsDate,
-      .foundationUUID, .essentialsUUID,
-      .swiftJavaError:
+      .foundationUUID, .essentialsUUID:
       return nil
     }
   }
@@ -80,8 +79,7 @@ enum JNIJavaTypeTranslator {
       .dictionary,
       .set,
       .foundationDate, .essentialsDate,
-      .foundationUUID, .essentialsUUID,
-      .swiftJavaError:
+      .foundationUUID, .essentialsUUID:
       nil
     }
   }
@@ -107,8 +105,7 @@ enum JNIJavaTypeTranslator {
       .dictionary,
       .set,
       .foundationDate, .essentialsDate,
-      .foundationUUID, .essentialsUUID,
-      .swiftJavaError:
+      .foundationUUID, .essentialsUUID:
       nil
     }
   }

Sources/JExtractSwiftLib/SwiftKnownTypes+Java.swift

@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024-2026 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import SwiftExtract
+
+extension SwiftNominalTypeDeclaration {
+  /// True if this is swift-java's runtime `SwiftJavaError` type, which jextract
+  /// maps to a thrown Java exception rather than an ordinary wrapped nominal
+  package var isSwiftJavaErrorType: Bool {
+    moduleName == "SwiftRuntimeFunctions" && name == "SwiftJavaError"
+  }
+}
+
+extension SwiftKnownTypeDeclKind {
+  /// Indicates whether this known type is translated by `wrap-java`
+  /// into the same type as `jextract`.
+  ///
+  /// This means we do not have to perform any mapping when passing
+  /// this type between jextract and wrap-java
+  package var isDirectlyTranslatedToWrapJava: Bool {
+    switch self {
+    case .bool, .int, .uint, .int8, .uint8, .int16, .uint16, .int32, .uint32, .int64, .uint64, .float, .double, .string,
+      .void:
+      return true
+    default:
+      return false
+    }
+  }
+}

Sources/SwiftExtract/SwiftTypes/SwiftKnownTypeDecls.swift

@@ -53,9 +53,6 @@ public enum SwiftKnownType: Equatable {
   case foundationUUID
   case essentialsUUID
 
-  // SwiftRuntimeFunctions
-  case swiftJavaError
-
   public init?(kind: SwiftKnownTypeDeclKind, genericArguments: [SwiftType]?) {
     switch kind {
     case .bool: self = .bool
@@ -109,7 +106,6 @@ public enum SwiftKnownType: Equatable {
     case .essentialsDate: self = .essentialsDate
     case .foundationUUID: self = .foundationUUID
     case .essentialsUUID: self = .essentialsUUID
-    case .swiftJavaError: self = .swiftJavaError
     }
   }
 
@@ -150,7 +146,6 @@ public enum SwiftKnownType: Equatable {
     case .essentialsDate: .essentialsDate
     case .foundationUUID: .foundationUUID
     case .essentialsUUID: .essentialsUUID
-    case .swiftJavaError: .swiftJavaError
     }
   }
 }
@@ -195,9 +190,6 @@ public enum SwiftKnownTypeDeclKind: String, Hashable {
   case foundationUUID = "Foundation.UUID"
   case essentialsUUID = "FoundationEssentials.UUID"
 
-  // SwiftRuntimeFunctions
-  case swiftJavaError = "SwiftRuntimeFunctions.SwiftJavaError"
-
   public var moduleAndName: (module: String, name: String) {
     let qualified = self.rawValue
     let period = qualified.firstIndex(of: ".")!
@@ -215,19 +207,4 @@ public enum SwiftKnownTypeDeclKind: String, Hashable {
       return false
     }
   }
-
-  /// Indicates whether this known type is translated by `wrap-java`
-  /// into the same type as `jextract`.
-  ///
-  /// This means we do not have to perform any mapping when passing
-  /// this type between jextract and wrap-java
-  public var isDirectlyTranslatedToWrapJava: Bool {
-    switch self {
-    case .bool, .int, .uint, .int8, .uint8, .int16, .uint16, .int32, .uint32, .int64, .uint64, .float, .double, .string,
-      .void:
-      return true
-    default:
-      return false
-    }
-  }
 }