[DiagnosticBridge] NFC: Refactor addQueuedDiagnostic to use BridgedStringRef instead of plain pointers

Author: xedin

include/swift/Bridging/ASTGen.h

@@ -27,11 +27,10 @@ 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,
+    BridgedStringRef text,
     BridgedDiagnosticSeverity severity, const void *_Nullable sourceLoc,
-    const char *_Nullable categoryName, ptrdiff_t categoryNameLength,
-    const char *_Nullable documentationPath,
-    ptrdiff_t documentationPathLength,
+    BridgedStringRef categoryName,
+    BridgedStringRef documentationPath,
     const void *_Nullable *_Nullable highlightRanges,
     ptrdiff_t numHighlightRanges);
 void swift_ASTGen_renderQueuedDiagnostics(

lib/AST/DiagnosticBridge.cpp

@@ -71,12 +71,10 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
 
   // FIXME: Translate Fix-Its.
   swift_ASTGen_addQueuedDiagnostic(queuedDiagnostics, perFrontendState,
-                                   text.data(), text.size(),
+                                   text.str(),
                                    severity, info.Loc.getOpaquePointerValue(),
-                                   info.Category.data(),
-                                   info.Category.size(),
-                                   documentationPath.data(),
-                                   documentationPath.size(),
+                                   info.Category,
+                                   documentationPath,
                                    highlightRanges.data(),
                                    highlightRanges.size() / 2);
 

lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift

@@ -241,14 +241,11 @@ 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,
+  categoryName: BridgedStringRef,
+  documentationPath: BridgedStringRef,
   highlightRangesPtr: UnsafePointer<BridgedSourceLoc>?,
   numHighlightRanges: Int
 ) {
@@ -349,10 +346,10 @@ public func addQueuedDiagnostic(
     }
   }
 
-  let category: DiagnosticCategory? = categoryName.flatMap { categoryNamePtr in
+  let category: DiagnosticCategory? = categoryName.data.flatMap { categoryNamePtr in
     let categoryNameBuffer = UnsafeBufferPointer(
       start: categoryNamePtr,
-      count: categoryLength
+      count: categoryName.count
     )
     let categoryName = String(decoding: categoryNameBuffer, as: UTF8.self)
 
@@ -363,10 +360,10 @@ public func addQueuedDiagnostic(
       return nil
     }
 
-    let documentationURL = documentationPath.map { documentationPathPtr in
+    let documentationURL = documentationPath.data.map { documentationPathPtr in
       let documentationPathBuffer = UnsafeBufferPointer(
         start: documentationPathPtr,
-        count: documentationPathLength
+        count: documentationPath.count
       )
 
       let documentationPath = String(decoding: documentationPathBuffer, as: UTF8.self)
@@ -390,7 +387,11 @@ public func addQueuedDiagnostic(
     diagnosticState.pointee.referencedCategories.insert(category)
   }
 
-  let textBuffer = UnsafeBufferPointer(start: text, count: textLength)
+  guard let textPtr = text.data, !text.isEmpty else {
+    return
+  }
+  
+  let textBuffer = UnsafeBufferPointer(start: textPtr, count: text.count)
   let diagnostic = Diagnostic(
     node: node,
     position: position,