ASTBridging: Bridge swift::DiagID directly

Author: AnthonyLatsis

SwiftCompilerSources/Sources/AST/DiagnosticEngine.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2022 Apple Inc. and the Swift project authors
+// Copyright (c) 2022 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -11,10 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 import ASTBridging
-
 import Basic
 
-public typealias DiagID = BridgedDiagID
+public typealias DiagID = swift.DiagID
 
 public protocol DiagnosticArgument {
   func _withBridgedDiagnosticArgument(_ fn: (BridgedDiagnosticArgument) -> Void)
@@ -130,6 +129,17 @@ public struct DiagnosticEngine {
     closure()
   }
 
+  // FIXME: Remove this overload once https://github.com/swiftlang/swift/issues/82318 is fixed.
+  public func diagnose(
+    _ id: DiagID,
+    arguments args: [DiagnosticArgument],
+    at position: SourceLoc?,
+    highlight: CharSourceRange? = nil,
+    fixIts: [DiagnosticFixIt] = []
+  ) {
+    diagnose(id, args, at: position, highlight: highlight, fixIts: fixIts)
+  }
+
   public func diagnose(_ id: DiagID,
                        _ args: DiagnosticArgument...,
                        at position: SourceLoc?,

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceDiagnostics.swift

@@ -139,7 +139,7 @@ private struct DiagnoseDependence {
 
   func diagnose(_ position: SourceLoc?, _ id: DiagID,
                 _ args: DiagnosticArgument...) {
-    context.diagnosticEngine.diagnose(id, args, at: position)
+    context.diagnosticEngine.diagnose(id, arguments: args, at: position)
   }
 
   /// Check that this use is inside the dependence scope.

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceInsertion.swift

@@ -263,7 +263,7 @@ private func insertResultDependencies(for apply: LifetimeDependentApply, _ conte
 }
 
 private func diagnoseUnknownDependenceSource(sourceLoc: SourceLoc?, _ context: FunctionPassContext) {
-  context.diagnosticEngine.diagnose(.lifetime_value_outside_scope, [], at: sourceLoc)
+  context.diagnosticEngine.diagnose(.lifetime_value_outside_scope, at: sourceLoc)
 }
 
 private func insertParameterDependencies(apply: LifetimeDependentApply, target: Operand,

SwiftCompilerSources/Sources/SIL/ASTExtensions.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information

include/swift/AST/ASTBridging.h

@@ -22,6 +22,7 @@
 
 #include "swift/AST/AccessorKind.h"
 #include "swift/AST/DiagnosticKind.h"
+#include "swift/AST/DiagnosticList.h"
 #include "swift/Basic/BasicBridging.h"
 
 #ifdef USED_IN_CPP_SOURCE
@@ -530,13 +531,6 @@ struct BridgedPatternBindingEntry {
 // MARK: Diagnostic Engine
 //===----------------------------------------------------------------------===//
 
-// NOTE: This must be the same underlying value as C++ 'swift::DiagID' defined
-// in 'DiagnosticList.cpp'.
-enum ENUM_EXTENSIBILITY_ATTR(open) BridgedDiagID : uint32_t {
-#define DIAG(KIND, ID, Group, Options, Text, Signature) BridgedDiagID_##ID,
-#include "swift/AST/DiagnosticsAll.def"
-};
-
 class BridgedDiagnosticArgument {
   int64_t storage[3];
 
@@ -579,7 +573,7 @@ class BridgedDiagnostic {
 SWIFT_NAME("BridgedDiagnosticEngine.diagnose(self:at:_:_:highlightAt:"
            "highlightLength:fixIts:)")
 void BridgedDiagnosticEngine_diagnose(
-    BridgedDiagnosticEngine, BridgedSourceLoc loc, BridgedDiagID diagID,
+    BridgedDiagnosticEngine, BridgedSourceLoc loc, swift::DiagID diagID,
     BridgedArrayRef arguments, BridgedSourceLoc highlightStart,
     uint32_t hightlightLength, BridgedArrayRef fixIts);
 

include/swift/AST/AccessorKind.h

@@ -23,10 +23,11 @@ namespace swift {
 // diagnostics.
 enum class ENUM_EXTENSIBILITY_ATTR(closed) AccessorKind {
 #define ACCESSOR(ID, KEYWORD) ID SWIFT_NAME(#KEYWORD),
+#define INIT_ACCESSOR(ID, KEYWORD)                                             \
+  ID, // FIXME: We should be able to remove this once Linux CI host Swift is
+      // upgraded to 6.0
 #define LAST_ACCESSOR(ID) Last = ID
 #include "swift/AST/AccessorKinds.def"
-#undef ACCESSOR
-#undef LAST_ACCESSOR
 };
 
 } // namespace swift

include/swift/AST/DiagnosticList.h

@@ -17,27 +17,28 @@
 #ifndef SWIFT_DIAGNOSTICLIST_H
 #define SWIFT_DIAGNOSTICLIST_H
 
-#include <cstdint>
-#include <type_traits>
+/// Be *very* careful with what you include here! See include caveats in
+/// `ASTBridging.h`.
+#include "swift/Basic/SwiftBridging.h"
+#include <stdint.h>
 
 namespace swift {
 
 /// Enumeration describing all of possible diagnostics.
 ///
 /// Each of the diagnostics described in Diagnostics.def has an entry in
 /// this enumeration type that uniquely identifies it.
-enum class DiagID : uint32_t {
+enum class ENUM_EXTENSIBILITY_ATTR(open) DiagID : uint32_t {
 #define DIAG(KIND, ID, Group, Options, Text, Signature) ID,
 #include "swift/AST/DiagnosticsAll.def"
   NumDiagsHandle
 };
 static_assert(static_cast<uint32_t>(swift::DiagID::invalid_diagnostic) == 0,
               "0 is not the invalid diagnostic ID");
 
-constexpr auto NumDiagIDs =
-    static_cast<std::underlying_type_t<DiagID>>(DiagID::NumDiagsHandle);
+constexpr auto NumDiagIDs = static_cast<uint32_t>(DiagID::NumDiagsHandle);
 
-enum class FixItID : uint32_t {
+enum class ENUM_EXTENSIBILITY_ATTR(open) FixItID : uint32_t {
 #define DIAG(KIND, ID, Group, Options, Text, Signature)
 #define FIXIT(ID, Text, Signature) ID,
 #include "swift/AST/DiagnosticsAll.def"

lib/AST/Bridging/DiagnosticsBridging.cpp

@@ -1,8 +1,8 @@
-//===--- Bridging/DiagnosticsBridging.cpp.cpp -----------------------------===//
+//===--- Bridging/DiagnosticsBridging.cpp -----------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2022-2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -49,14 +49,12 @@ BridgedDiagnosticFixIt::BridgedDiagnosticFixIt(BridgedSourceLoc start,
 }
 
 void BridgedDiagnosticEngine_diagnose(
-    BridgedDiagnosticEngine bridgedEngine, BridgedSourceLoc loc,
-    BridgedDiagID bridgedDiagID,
+    BridgedDiagnosticEngine bridgedEngine, BridgedSourceLoc loc, DiagID diagID,
     BridgedArrayRef /*BridgedDiagnosticArgument*/ bridgedArguments,
     BridgedSourceLoc highlightStart, uint32_t hightlightLength,
     BridgedArrayRef /*BridgedDiagnosticFixIt*/ bridgedFixIts) {
   auto *D = bridgedEngine.unbridged();
 
-  auto diagID = static_cast<DiagID>(bridgedDiagID);
   SmallVector<DiagnosticArgument, 2> arguments;
   for (auto arg : bridgedArguments.unbridged<BridgedDiagnosticArgument>()) {
     arguments.push_back(arg.unbridged());

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -394,7 +394,7 @@ extension ASTGenVisitor {
     case ._modify:
       return ._modify
     case .`init`:
-      return .`init`
+      return .Init
     case .read:
       precondition(ctx.langOptsHasFeature(.CoroutineAccessors), "(compiler bug) 'read' accessor should only be parsed with 'CoroutineAccessors' feature")
       return .read