Merge pull request #80126 from xedin/refactor-diagnostic-bridge-to-use-bridged-structs

[DiagnosticBridge] NFC: Refactor `addQueuedDiagnostic` to use Bridged* types instead of pointers

Author: xedin

include/swift/Bridging/ASTGen.h

@@ -27,12 +27,12 @@ void swift_ASTGen_addQueuedSourceFile(
     intptr_t displayNameLength, ssize_t parentID, ssize_t positionInParent);
 void swift_ASTGen_addQueuedDiagnostic(
     void *_Nonnull queued, void *_Nonnull state,
-    const char *_Nonnull text, ptrdiff_t textLength,
-    BridgedDiagnosticSeverity severity, const void *_Nullable sourceLoc,
-    const char *_Nullable categoryName, ptrdiff_t categoryNameLength,
-    const char *_Nullable documentationPath,
-    ptrdiff_t documentationPathLength,
-    const void *_Nullable *_Nullable highlightRanges,
+    BridgedStringRef text,
+    BridgedDiagnosticSeverity severity,
+    BridgedSourceLoc sourceLoc,
+    BridgedStringRef categoryName,
+    BridgedStringRef documentationPath,
+    const BridgedCharSourceRange *_Nullable highlightRanges,
     ptrdiff_t numHighlightRanges);
 void swift_ASTGen_renderQueuedDiagnostics(
     void *_Nonnull queued, ssize_t contextSize, ssize_t colorize,

lib/AST/DiagnosticBridge.cpp

@@ -56,13 +56,10 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
   }
 
   // Map the highlight ranges.
-  SmallVector<const void *, 2> highlightRanges;
+  SmallVector<BridgedCharSourceRange, 2> highlightRanges;
   for (const auto &range : info.Ranges) {
-    if (range.isInvalid())
-      continue;
-
-    highlightRanges.push_back(range.getStart().getOpaquePointerValue());
-    highlightRanges.push_back(range.getEnd().getOpaquePointerValue());
+    if (range.isValid())
+      highlightRanges.push_back(range);
   }
 
   StringRef documentationPath;
@@ -71,14 +68,12 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
 
   // FIXME: Translate Fix-Its.
   swift_ASTGen_addQueuedDiagnostic(queuedDiagnostics, perFrontendState,
-                                   text.data(), text.size(),
-                                   severity, info.Loc.getOpaquePointerValue(),
-                                   info.Category.data(),
-                                   info.Category.size(),
-                                   documentationPath.data(),
-                                   documentationPath.size(),
+                                   text.str(),
+                                   severity, info.Loc,
+                                   info.Category,
+                                   documentationPath,
                                    highlightRanges.data(),
-                                   highlightRanges.size() / 2);
+                                   highlightRanges.size());
 
   // TODO: A better way to do this would be to pass the notes as an
   // argument to `swift_ASTGen_addQueuedDiagnostic` but that requires

lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift

@@ -241,15 +241,12 @@ public func addQueuedSourceFile(
 public func addQueuedDiagnostic(
   queuedDiagnosticsPtr: UnsafeMutableRawPointer,
   perFrontendDiagnosticStatePtr: UnsafeMutableRawPointer,
-  text: UnsafePointer<UInt8>,
-  textLength: Int,
+  text: BridgedStringRef,
   severity: BridgedDiagnosticSeverity,
   cLoc: BridgedSourceLoc,
-  categoryName: UnsafePointer<UInt8>?,
-  categoryLength: Int,
-  documentationPath: UnsafePointer<UInt8>?,
-  documentationPathLength: Int,
-  highlightRangesPtr: UnsafePointer<BridgedSourceLoc>?,
+  categoryName: BridgedStringRef,
+  documentationPath: BridgedStringRef,
+  highlightRangesPtr: UnsafePointer<BridgedCharSourceRange>?,
   numHighlightRanges: Int
 ) {
   let queuedDiagnostics = queuedDiagnosticsPtr.assumingMemoryBound(
@@ -302,14 +299,16 @@ public func addQueuedDiagnostic(
 
   // Map the highlights.
   var highlights: [Syntax] = []
-  let highlightRanges = UnsafeBufferPointer<BridgedSourceLoc>(
+  let highlightRanges = UnsafeBufferPointer<BridgedCharSourceRange>(
     start: highlightRangesPtr,
-    count: numHighlightRanges * 2
+    count: numHighlightRanges
   )
   for index in 0..<numHighlightRanges {
+    let range = highlightRanges[index]
+
     // Make sure both the start and the end land within this source file.
-    guard let start = highlightRanges[index * 2].getOpaquePointerValue(),
-      let end = highlightRanges[index * 2 + 1].getOpaquePointerValue()
+    guard let start = range.start.getOpaquePointerValue(),
+      let end = range.start.advanced(by: range.byteLength).getOpaquePointerValue()
     else {
       continue
     }
@@ -349,53 +348,37 @@ public func addQueuedDiagnostic(
     }
   }
 
-  let category: DiagnosticCategory? = categoryName.flatMap { categoryNamePtr in
-    let categoryNameBuffer = UnsafeBufferPointer(
-      start: categoryNamePtr,
-      count: categoryLength
-    )
-    let categoryName = String(decoding: categoryNameBuffer, as: UTF8.self)
-
-    // If the data comes from serialized diagnostics, it's possible that
-    // the category name is empty because StringRef() is serialized into
-    // an empty string.
-    guard !categoryName.isEmpty else {
-      return nil
+  let documentationPath = String(bridged: documentationPath)
+  let documentationURL: String? = if !documentationPath.isEmpty {
+      // If this looks doesn't look like a URL, prepend file://.
+      documentationPath.looksLikeURL ? documentationPath : "file://\(documentationPath)"
+    } else {
+      nil
     }
 
-    let documentationURL = documentationPath.map { documentationPathPtr in
-      let documentationPathBuffer = UnsafeBufferPointer(
-        start: documentationPathPtr,
-        count: documentationPathLength
+  let categoryName = String(bridged: categoryName)
+  // If the data comes from serialized diagnostics, it's possible that
+  // the category name is empty because StringRef() is serialized into
+  // an empty string.
+  let category: DiagnosticCategory? = if !categoryName.isEmpty {
+      DiagnosticCategory(
+        name: categoryName,
+        documentationURL: documentationURL
       )
-
-      let documentationPath = String(decoding: documentationPathBuffer, as: UTF8.self)
-
-      // If this looks doesn't look like a URL, prepend file://.
-      if !documentationPath.looksLikeURL {
-        return "file://\(documentationPath)"
-      }
-
-      return documentationPath
+    } else {
+      nil
     }
 
-    return DiagnosticCategory(
-      name: categoryName,
-      documentationURL: documentationURL
-    )
-  }
-
   // Note that we referenced this category.
   if let category {
     diagnosticState.pointee.referencedCategories.insert(category)
   }
 
-  let textBuffer = UnsafeBufferPointer(start: text, count: textLength)
   let diagnostic = Diagnostic(
     node: node,
     position: position,
     message: SimpleDiagnostic(
-      message: String(decoding: textBuffer, as: UTF8.self),
+      message: String(bridged: text),
       severity: severity.asSeverity,
       category: category
     ),