ASTBriding: Bridge swift::DiagnosticKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -19,6 +19,7 @@
 // Pure bridging mode does not permit including any C++/llvm/swift headers.
 // See also the comments for `BRIDGING_MODE` in the top-level CMakeLists.txt file.
 //
+#include "swift/AST/DiagnosticKind.h"
 #include "swift/Basic/BasicBridging.h"
 
 #ifdef USED_IN_CPP_SOURCE
@@ -565,15 +566,6 @@ class BridgedDiagnosticFixIt {
   BridgedDiagnosticFixIt(BridgedSourceLoc start, uint32_t length, BridgedStringRef text);
 };
 
-/// Diagnostic severity when reporting diagnostics.
-enum ENUM_EXTENSIBILITY_ATTR(open) BridgedDiagnosticSeverity : size_t {
-  BridgedFatalError,
-  BridgedError,
-  BridgedWarning,
-  BridgedRemark,
-  BridgedNote,
-};
-
 class BridgedDiagnostic {
 public:
   struct Impl;
@@ -612,7 +604,7 @@ bool BridgedDiagnosticEngine_hadAnyError(BridgedDiagnosticEngine);
 SWIFT_NAME("BridgedDiagnostic.init(at:message:severity:engine:)")
 BridgedDiagnostic BridgedDiagnostic_create(BridgedSourceLoc cLoc,
                                            BridgedStringRef cText,
-                                           BridgedDiagnosticSeverity severity,
+                                           swift::DiagnosticKind severity,
                                            BridgedDiagnosticEngine cDiags);
 
 /// Highlight a source range as part of the diagnostic.

include/swift/AST/DiagnosticConsumer.h

@@ -19,6 +19,7 @@
 #ifndef SWIFT_BASIC_DIAGNOSTICCONSUMER_H
 #define SWIFT_BASIC_DIAGNOSTICCONSUMER_H
 
+#include "swift/AST/DiagnosticKind.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/SourceLoc.h"
 #include "llvm/Support/SourceMgr.h"
@@ -30,15 +31,6 @@ namespace swift {
   class SourceManager;
   enum class DiagID : uint32_t;
 
-/// Describes the kind of diagnostic.
-///
-enum class DiagnosticKind : uint8_t {
-  Error,
-  Warning,
-  Remark,
-  Note
-};
-
 /// Information about a diagnostic passed to DiagnosticConsumers.
 struct DiagnosticInfo {
   DiagID ID = DiagID(0);

include/swift/AST/DiagnosticKind.h

@@ -0,0 +1,40 @@
+//===-- AST/DiagnosticKind.h ------------------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 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
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This enum lives in its own header so that it can be included in
+/// `ASTBridging.h`.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_AST_DIAGNOSTIC_KIND_H
+#define SWIFT_AST_DIAGNOSTIC_KIND_H
+
+/// Be *very* careful with what you include here! See include caveats in
+/// `ASTBridging.h`.
+#include "swift/Basic/Compiler.h"
+#include "swift/Basic/SwiftBridging.h"
+#include <stdint.h>
+
+namespace swift {
+
+/// Describes the kind of diagnostic.
+enum class ENUM_EXTENSIBILITY_ATTR(open) DiagnosticKind : uint8_t {
+  Error SWIFT_NAME("error"),
+  Warning SWIFT_NAME("warning"),
+  Remark SWIFT_NAME("remark"),
+  Note SWIFT_NAME("note")
+};
+
+} // namespace swift
+
+#endif // SWIFT_AST_DIAGNOSTIC_KIND_H

include/swift/Bridging/ASTGen.h

@@ -28,7 +28,7 @@ void swift_ASTGen_addQueuedSourceFile(
 void swift_ASTGen_addQueuedDiagnostic(
     void *_Nonnull queued, void *_Nonnull state,
     BridgedStringRef text,
-    BridgedDiagnosticSeverity severity,
+    swift::DiagnosticKind severity,
     BridgedSourceLoc sourceLoc,
     BridgedStringRef categoryName,
     BridgedStringRef documentationPath,
@@ -38,7 +38,7 @@ void swift_ASTGen_addQueuedDiagnostic(
 void swift_ASTGen_renderSingleDiagnostic(
     void *_Nonnull state,
     BridgedStringRef text,
-    BridgedDiagnosticSeverity severity,
+    swift::DiagnosticKind severity,
     BridgedStringRef categoryName,
     BridgedStringRef documentationPath,
     ssize_t colorize,

lib/AST/Bridging/DiagnosticsBridging.cpp

@@ -118,7 +118,7 @@ struct BridgedDiagnostic::Impl {
 
 BridgedDiagnostic BridgedDiagnostic_create(BridgedSourceLoc cLoc,
                                            BridgedStringRef cText,
-                                           BridgedDiagnosticSeverity severity,
+                                           DiagnosticKind severity,
                                            BridgedDiagnosticEngine cDiags) {
   StringRef origText = cText.unbridged();
   BridgedDiagnostic::Impl::Allocator alloc;
@@ -128,19 +128,16 @@ BridgedDiagnostic BridgedDiagnostic_create(BridgedSourceLoc cLoc,
 
   Diag<StringRef> diagID;
   switch (severity) {
-  case BridgedDiagnosticSeverity::BridgedError:
+  case DiagnosticKind::Error:
     diagID = diag::bridged_error;
     break;
-  case BridgedDiagnosticSeverity::BridgedFatalError:
-    diagID = diag::bridged_fatal_error;
-    break;
-  case BridgedDiagnosticSeverity::BridgedNote:
+  case DiagnosticKind::Note:
     diagID = diag::bridged_note;
     break;
-  case BridgedDiagnosticSeverity::BridgedRemark:
+  case DiagnosticKind::Remark:
     diagID = diag::bridged_remark;
     break;
-  case BridgedDiagnosticSeverity::BridgedWarning:
+  case DiagnosticKind::Warning:
     diagID = diag::bridged_warning;
     break;
   }

lib/AST/DiagnosticBridge.cpp

@@ -26,21 +26,6 @@
 using namespace swift;
 
 #if SWIFT_BUILD_SWIFT_SYNTAX
-static BridgedDiagnosticSeverity bridgeDiagnosticSeverity(DiagnosticKind kind) {
-  switch (kind) {
-  case DiagnosticKind::Error:
-    return BridgedDiagnosticSeverity::BridgedError;
-
-  case DiagnosticKind::Warning:
-    return BridgedDiagnosticSeverity::BridgedWarning;
-
-  case DiagnosticKind::Remark:
-    return BridgedDiagnosticSeverity::BridgedRemark;
-
-  case DiagnosticKind::Note:
-    return BridgedDiagnosticSeverity::BridgedNote;
-  }
-}
 
 /// Enqueue a diagnostic with ASTGen's diagnostic rendering.
 static void addQueueDiagnostic(void *queuedDiagnostics,
@@ -53,8 +38,6 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
                                            info.FormatArgs);
   }
 
-  BridgedDiagnosticSeverity severity = bridgeDiagnosticSeverity(info.Kind);
-
   // Map the highlight ranges.
   SmallVector<BridgedCharSourceRange, 2> highlightRanges;
   for (const auto &range : info.Ranges) {
@@ -72,7 +55,7 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
   swift_ASTGen_addQueuedDiagnostic(
       queuedDiagnostics, perFrontendState,
       text.str(),
-      severity, info.Loc,
+      info.Kind, info.Loc,
       info.Category,
       documentationPath,
       highlightRanges.data(), highlightRanges.size(),
@@ -102,11 +85,9 @@ void DiagnosticBridge::emitDiagnosticWithoutLocation(
                                            info.FormatArgs);
   }
 
-  BridgedDiagnosticSeverity severity = bridgeDiagnosticSeverity(info.Kind);
-
   BridgedStringRef bridgedRenderedString{nullptr, 0};
   swift_ASTGen_renderSingleDiagnostic(
-      perFrontendState, text.str(), severity, info.Category,
+      perFrontendState, text.str(), info.Kind, info.Category,
       llvm::StringRef(info.CategoryDocumentationURL), forceColors ? 1 : 0,
       &bridgedRenderedString);
 

lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift

@@ -120,7 +120,7 @@ public func emitDiagnostic(
 }
 
 extension DiagnosticSeverity {
-  public var bridged: BridgedDiagnosticSeverity {
+  public var bridged: swift.DiagnosticKind {
     switch self {
     case .error: return .error
     case .note: return .note
@@ -177,10 +177,9 @@ fileprivate struct SimpleDiagnostic: DiagnosticMessage {
   }
 }
 
-extension BridgedDiagnosticSeverity {
+extension swift.DiagnosticKind {
   var asSeverity: DiagnosticSeverity {
     switch self {
-    case .fatalError: return .error
     case .error: return .error
     case .warning: return .warning
     case .remark: return .remark
@@ -250,7 +249,7 @@ public func addQueuedDiagnostic(
   queuedDiagnosticsPtr: UnsafeMutableRawPointer,
   perFrontendDiagnosticStatePtr: UnsafeMutableRawPointer,
   text: BridgedStringRef,
-  severity: BridgedDiagnosticSeverity,
+  severity: swift.DiagnosticKind,
   cLoc: BridgedSourceLoc,
   categoryName: BridgedStringRef,
   documentationPath: BridgedStringRef,
@@ -430,7 +429,7 @@ public func addQueuedDiagnostic(
 public func renderSingleDiagnostic(
   perFrontendDiagnosticStatePtr: UnsafeMutableRawPointer,
   text: BridgedStringRef,
-  severity: BridgedDiagnosticSeverity,
+  severity: swift.DiagnosticKind,
   categoryName: BridgedStringRef,
   documentationPath: BridgedStringRef,
   colorize: Int,

lib/ASTGen/Sources/MacroEvaluation/PluginHost.swift

@@ -262,7 +262,7 @@ class PluginDiagnosticsEngine {
     fixItChanges: [PluginMessage.Diagnostic.FixIt.Change] = []
   ) {
     // Map severity
-    let bridgedSeverity: BridgedDiagnosticSeverity
+    let bridgedSeverity: swift.DiagnosticKind
     switch severity {
     case .error: bridgedSeverity = .error
     case .note: bridgedSeverity = .note