[ASTGen] Use SWIFT_NAME in some more places

hamishknight · hamishknight · commit 66b3ca4f260d · 2023-10-20T11:30:25.000+01:00
diff --git a/include/swift/AST/CASTBridging.h b/include/swift/AST/CASTBridging.h
@@ -291,26 +291,32 @@ extern "C" {
 ///
 /// \returns a diagnostic instance that can be extended with additional
 /// information and then must be finished via \c SwiftDiagnostic_finish.
-BridgedDiagnostic Diagnostic_create(BridgedDiagnosticEngine cDiags,
+SWIFT_NAME("BridgedDiagnostic.init(at:message:severity:engine:)")
+BridgedDiagnostic Diagnostic_create(BridgedSourceLoc cLoc, BridgedString cText,
                                     BridgedDiagnosticSeverity severity,
-                                    BridgedSourceLoc cLoc, BridgedString cText);
+                                    BridgedDiagnosticEngine cDiags);
 
 /// Highlight a source range as part of the diagnostic.
+SWIFT_NAME("BridgedDiagnostic.highlight(self:start:end:)")
 void Diagnostic_highlight(BridgedDiagnostic cDiag, BridgedSourceLoc cStartLoc,
                           BridgedSourceLoc cEndLoc);
 
 /// Add a Fix-It to replace a source range as part of the diagnostic.
+SWIFT_NAME("BridgedDiagnostic.fixItReplace(self:start:end:replacement:)")
 void Diagnostic_fixItReplace(BridgedDiagnostic cDiag,
                              BridgedSourceLoc cStartLoc,
                              BridgedSourceLoc cEndLoc,
                              BridgedString cReplaceText);
 
 /// Finish the given diagnostic and emit it.
+SWIFT_NAME("BridgedDiagnostic.finish(self:)")
 void Diagnostic_finish(BridgedDiagnostic cDiag);
 
+SWIFT_NAME("BridgedASTContext.getIdentifier(self:_:)")
 BridgedIdentifier ASTContext_getIdentifier(BridgedASTContext cContext,
                                            BridgedString cStr);
 
+SWIFT_NAME("BridgedASTContext.langOptsHasFeature(self:_:)")
 _Bool ASTContext_langOptsHasFeature(BridgedASTContext cContext,
                                     BridgedFeature feature);
 
@@ -339,6 +345,7 @@ SWIFT_NAME("BridgedSequenceExpr.createParsed(_:exprs:)")
 BridgedSequenceExpr SequenceExpr_createParsed(BridgedASTContext cContext,
                                               BridgedArrayRef exprs);
 
+SWIFT_NAME("BridgedSourceLoc.advanced(self:by:)")
 BridgedSourceLoc SourceLoc_advanced(BridgedSourceLoc cLoc, size_t len);
 
 SWIFT_NAME("BridgedTupleExpr.createParsed(_:leftParenLoc:exprs:labels:"
diff --git a/lib/AST/CASTBridging.cpp b/lib/AST/CASTBridging.cpp
@@ -167,10 +167,9 @@ static TypeAttrKind convertTypeAttrKind(BridgedTypeAttrKind kind) {
   }
 }
 
-BridgedDiagnostic Diagnostic_create(BridgedDiagnosticEngine cDiags,
+BridgedDiagnostic Diagnostic_create(BridgedSourceLoc cLoc, BridgedString cText,
                                     BridgedDiagnosticSeverity severity,
-                                    BridgedSourceLoc cLoc,
-                                    BridgedString cText) {
+                                    BridgedDiagnosticEngine cDiags) {
   StringRef origText = convertString(cText);
   BridgedDiagnosticImpl::Allocator alloc;
   StringRef text = origText.copy(alloc);
diff --git a/lib/ASTGen/Sources/ASTGen/Bridge.swift b/lib/ASTGen/Sources/ASTGen/Bridge.swift
@@ -21,7 +21,7 @@ extension BridgedSourceLoc {
     in buffer: UnsafeBufferPointer<UInt8>
   ) {
     precondition(position.utf8Offset >= 0 && position.utf8Offset <= buffer.count)
-    self = SourceLoc_advanced(BridgedSourceLoc(raw: buffer.baseAddress!), position.utf8Offset)
+    self = BridgedSourceLoc(raw: buffer.baseAddress!).advanced(by: position.utf8Offset)
   }
 }
 
@@ -103,7 +103,7 @@ extension TokenSyntax {
   func bridgedIdentifier(in astgen: ASTGenVisitor) -> BridgedIdentifier {
     var text = self.text
     return text.withBridgedString { bridged in
-      ASTContext_getIdentifier(astgen.ctx, bridged)
+      astgen.ctx.getIdentifier(bridged)
     }
   }
 
diff --git a/lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift b/lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift
@@ -21,17 +21,19 @@ fileprivate func emitDiagnosticParts(
   // Emit the diagnostic
   var mutableMessage = message
   let diag = mutableMessage.withBridgedString { bridgedMessage in
-    Diagnostic_create(
-      diagnosticEngine, bridgedSeverity, bridgedSourceLoc(at: position),
-      bridgedMessage
+    BridgedDiagnostic(
+      at: bridgedSourceLoc(at: position),
+      message: bridgedMessage,
+      severity: bridgedSeverity,
+      engine: diagnosticEngine
     )
   }
 
   // Emit highlights
   for highlight in highlights {
-    Diagnostic_highlight(
-      diag, bridgedSourceLoc(at: highlight.positionAfterSkippingLeadingTrivia),
-      bridgedSourceLoc(at: highlight.endPositionBeforeTrailingTrivia)
+    diag.highlight(
+      start: bridgedSourceLoc(at: highlight.positionAfterSkippingLeadingTrivia),
+      end: bridgedSourceLoc(at: highlight.endPositionBeforeTrailingTrivia)
     )
   }
 
@@ -60,14 +62,14 @@ fileprivate func emitDiagnosticParts(
     }
 
     newText.withBridgedString { bridgedMessage in
-      Diagnostic_fixItReplace(
-        diag, replaceStartLoc, replaceEndLoc,
-        bridgedMessage
+      diag.fixItReplace(
+        start: replaceStartLoc, end: replaceEndLoc,
+        replacement: bridgedMessage
       )
     }
   }
 
-  Diagnostic_finish(diag);
+  diag.finish();
 }
 
 /// Emit the given diagnostic via the diagnostic engine.
@@ -139,19 +141,19 @@ extension SourceManager {
     // Emit the diagnostic
     var mutableMessage = message
     let diag = mutableMessage.withBridgedString { bridgedMessage in
-      Diagnostic_create(
-        bridgedDiagEngine, bridgedSeverity,
-        bridgedSourceLoc(for: node, at: position),
-        bridgedMessage
+      BridgedDiagnostic(
+        at: bridgedSourceLoc(for: node, at: position),
+        message: bridgedMessage,
+        severity: bridgedSeverity,
+        engine: bridgedDiagEngine
       )
     }
 
     // Emit highlights
     for highlight in highlights {
-      Diagnostic_highlight(
-        diag,
-        bridgedSourceLoc(for: highlight, at: highlight.positionAfterSkippingLeadingTrivia),
-        bridgedSourceLoc(for: highlight, at: highlight.endPositionBeforeTrailingTrivia)
+      diag.highlight(
+        start: bridgedSourceLoc(for: highlight, at: highlight.positionAfterSkippingLeadingTrivia),
+        end: bridgedSourceLoc(for: highlight, at: highlight.endPositionBeforeTrailingTrivia)
       )
     }
 
@@ -193,14 +195,14 @@ extension SourceManager {
       }
 
       newText.withBridgedString { bridgedMessage in
-        Diagnostic_fixItReplace(
-          diag, replaceStartLoc, replaceEndLoc,
-          bridgedMessage
+        diag.fixItReplace(
+          start: replaceStartLoc, end: replaceEndLoc,
+          replacement: bridgedMessage
         )
       }
     }
 
-    Diagnostic_finish(diag);
+    diag.finish();
   }
 
   /// Emit a diagnostic via the C++ diagnostic engine.
diff --git a/lib/ASTGen/Sources/ASTGen/PluginHost.swift b/lib/ASTGen/Sources/ASTGen/PluginHost.swift
@@ -274,18 +274,20 @@ class PluginDiagnosticsEngine {
     // Emit the diagnostic
     var mutableMessage = message
     let diag = mutableMessage.withBridgedString { bridgedMessage in
-      Diagnostic_create(
-        bridgedDiagEngine, bridgedSeverity,
-        bridgedSourceLoc(at: position),
-        bridgedMessage)
+      BridgedDiagnostic(
+        at: bridgedSourceLoc(at: position),
+        message: bridgedMessage,
+        severity: bridgedSeverity,
+        engine: bridgedDiagEngine
+      )
     }
 
     // Emit highlights
     for highlight in highlights {
       guard let (startLoc, endLoc) = bridgedSourceRange(for: highlight) else {
         continue
       }
-      Diagnostic_highlight(diag, startLoc, endLoc)
+      diag.highlight(start: startLoc, end: endLoc)
     }
 
     // Emit changes for a Fix-It.
@@ -295,12 +297,12 @@ class PluginDiagnosticsEngine {
       }
       var newText = change.newText
       newText.withBridgedString { bridgedFixItText in
-        Diagnostic_fixItReplace(
-          diag, startLoc, endLoc, bridgedFixItText)
+        diag.fixItReplace(
+          start: startLoc, end: endLoc, replacement: bridgedFixItText)
       }
     }
 
-    Diagnostic_finish(diag)
+    diag.finish()
   }
 
   /// Emit diagnostics.
@@ -339,7 +341,7 @@ class PluginDiagnosticsEngine {
     guard let bufferBaseAddress = exportedSourceFile.pointee.buffer.baseAddress else {
       return nil
     }
-    return SourceLoc_advanced(BridgedSourceLoc(raw: bufferBaseAddress), offset)
+    return BridgedSourceLoc(raw: bufferBaseAddress).advanced(by: offset)
   }
 
   /// C++ source location from a position value from a plugin.
diff --git a/lib/ASTGen/Sources/ASTGen/SourceFile.swift b/lib/ASTGen/Sources/ASTGen/SourceFile.swift
@@ -31,7 +31,7 @@ extension Parser.ExperimentalFeatures {
     guard let context = context else { return }
 
     func mapFeature(_ bridged: BridgedFeature, to feature: Self) {
-      if ASTContext_langOptsHasFeature(context, bridged) {
+      if context.langOptsHasFeature(bridged) {
         insert(feature)
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -167,10 +167,9 @@ static TypeAttrKind convertTypeAttrKind(BridgedTypeAttrKind kind) {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`170`		`-BridgedDiagnostic Diagnostic_create(BridgedDiagnosticEngine cDiags,`
	`170`	`+BridgedDiagnostic Diagnostic_create(BridgedSourceLoc cLoc, BridgedString cText,`
`171`	`171`	`BridgedDiagnosticSeverity severity,`
`172`		`- BridgedSourceLoc cLoc,`
`173`		`- BridgedString cText) {`
	`172`	`+ BridgedDiagnosticEngine cDiags) {`
`174`	`173`	`StringRef origText = convertString(cText);`
`175`	`174`	`BridgedDiagnosticImpl::Allocator alloc;`
`176`	`175`	`StringRef text = origText.copy(alloc);`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ extension BridgedSourceLoc {`
`21`	`21`	`in buffer: UnsafeBufferPointer<UInt8>`
`22`	`22`	`) {`
`23`	`23`	`precondition(position.utf8Offset >= 0 && position.utf8Offset <= buffer.count)`
`24`		`- self = SourceLoc_advanced(BridgedSourceLoc(raw: buffer.baseAddress!), position.utf8Offset)`
	`24`	`+ self = BridgedSourceLoc(raw: buffer.baseAddress!).advanced(by: position.utf8Offset)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`@@ -103,7 +103,7 @@ extension TokenSyntax {`
`103`	`103`	`func bridgedIdentifier(in astgen: ASTGenVisitor) -> BridgedIdentifier {`
`104`	`104`	`var text = self.text`
`105`	`105`	`return text.withBridgedString { bridged in`
`106`		`- ASTContext_getIdentifier(astgen.ctx, bridged)`
	`106`	`+ astgen.ctx.getIdentifier(bridged)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -21,17 +21,19 @@ fileprivate func emitDiagnosticParts(`
`21`	`21`	`// Emit the diagnostic`
`22`	`22`	`var mutableMessage = message`
`23`	`23`	`let diag = mutableMessage.withBridgedString { bridgedMessage in`
`24`		`- Diagnostic_create(`
`25`		`- diagnosticEngine, bridgedSeverity, bridgedSourceLoc(at: position),`
`26`		`- bridgedMessage`
	`24`	`+ BridgedDiagnostic(`
	`25`	`+ at: bridgedSourceLoc(at: position),`
	`26`	`+ message: bridgedMessage,`
	`27`	`+ severity: bridgedSeverity,`
	`28`	`+ engine: diagnosticEngine`
`27`	`29`	`)`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`// Emit highlights`
`31`	`33`	`for highlight in highlights {`
`32`		`- Diagnostic_highlight(`
`33`		`- diag, bridgedSourceLoc(at: highlight.positionAfterSkippingLeadingTrivia),`
`34`		`- bridgedSourceLoc(at: highlight.endPositionBeforeTrailingTrivia)`
	`34`	`+ diag.highlight(`
	`35`	`+ start: bridgedSourceLoc(at: highlight.positionAfterSkippingLeadingTrivia),`
	`36`	`+ end: bridgedSourceLoc(at: highlight.endPositionBeforeTrailingTrivia)`
`35`	`37`	`)`
`36`	`38`	`}`
`37`	`39`
`@@ -60,14 +62,14 @@ fileprivate func emitDiagnosticParts(`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`newText.withBridgedString { bridgedMessage in`
`63`		`- Diagnostic_fixItReplace(`
`64`		`- diag, replaceStartLoc, replaceEndLoc,`
`65`		`- bridgedMessage`
	`65`	`+ diag.fixItReplace(`
	`66`	`+ start: replaceStartLoc, end: replaceEndLoc,`
	`67`	`+ replacement: bridgedMessage`
`66`	`68`	`)`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`
`70`		`- Diagnostic_finish(diag);`
	`72`	`+ diag.finish();`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`/// Emit the given diagnostic via the diagnostic engine.`
`@@ -139,19 +141,19 @@ extension SourceManager {`
`139`	`141`	`// Emit the diagnostic`
`140`	`142`	`var mutableMessage = message`
`141`	`143`	`let diag = mutableMessage.withBridgedString { bridgedMessage in`
`142`		`- Diagnostic_create(`
`143`		`- bridgedDiagEngine, bridgedSeverity,`
`144`		`- bridgedSourceLoc(for: node, at: position),`
`145`		`- bridgedMessage`
	`144`	`+ BridgedDiagnostic(`
	`145`	`+ at: bridgedSourceLoc(for: node, at: position),`
	`146`	`+ message: bridgedMessage,`
	`147`	`+ severity: bridgedSeverity,`
	`148`	`+ engine: bridgedDiagEngine`
`146`	`149`	`)`
`147`	`150`	`}`
`148`	`151`
`149`	`152`	`// Emit highlights`
`150`	`153`	`for highlight in highlights {`
`151`		`- Diagnostic_highlight(`
`152`		`- diag,`
`153`		`- bridgedSourceLoc(for: highlight, at: highlight.positionAfterSkippingLeadingTrivia),`
`154`		`- bridgedSourceLoc(for: highlight, at: highlight.endPositionBeforeTrailingTrivia)`
	`154`	`+ diag.highlight(`
	`155`	`+ start: bridgedSourceLoc(for: highlight, at: highlight.positionAfterSkippingLeadingTrivia),`
	`156`	`+ end: bridgedSourceLoc(for: highlight, at: highlight.endPositionBeforeTrailingTrivia)`
`155`	`157`	`)`
`156`	`158`	`}`
`157`	`159`
`@@ -193,14 +195,14 @@ extension SourceManager {`
`193`	`195`	`}`
`194`	`196`
`195`	`197`	`newText.withBridgedString { bridgedMessage in`
`196`		`- Diagnostic_fixItReplace(`
`197`		`- diag, replaceStartLoc, replaceEndLoc,`
`198`		`- bridgedMessage`
	`198`	`+ diag.fixItReplace(`
	`199`	`+ start: replaceStartLoc, end: replaceEndLoc,`
	`200`	`+ replacement: bridgedMessage`
`199`	`201`	`)`
`200`	`202`	`}`
`201`	`203`	`}`
`202`	`204`
`203`		`- Diagnostic_finish(diag);`
	`205`	`+ diag.finish();`
`204`	`206`	`}`
`205`	`207`
`206`	`208`	`/// Emit a diagnostic via the C++ diagnostic engine.`
Original file line number	Diff line number	Diff line change
`@@ -274,18 +274,20 @@ class PluginDiagnosticsEngine {`
`274`	`274`	`// Emit the diagnostic`
`275`	`275`	`var mutableMessage = message`
`276`	`276`	`let diag = mutableMessage.withBridgedString { bridgedMessage in`
`277`		`- Diagnostic_create(`
`278`		`- bridgedDiagEngine, bridgedSeverity,`
`279`		`- bridgedSourceLoc(at: position),`
`280`		`- bridgedMessage)`
	`277`	`+ BridgedDiagnostic(`
	`278`	`+ at: bridgedSourceLoc(at: position),`
	`279`	`+ message: bridgedMessage,`
	`280`	`+ severity: bridgedSeverity,`
	`281`	`+ engine: bridgedDiagEngine`
	`282`	`+ )`
`281`	`283`	`}`
`282`	`284`
`283`	`285`	`// Emit highlights`
`284`	`286`	`for highlight in highlights {`
`285`	`287`	`guard let (startLoc, endLoc) = bridgedSourceRange(for: highlight) else {`
`286`	`288`	`continue`
`287`	`289`	`}`
`288`		`- Diagnostic_highlight(diag, startLoc, endLoc)`
	`290`	`+ diag.highlight(start: startLoc, end: endLoc)`
`289`	`291`	`}`
`290`	`292`
`291`	`293`	`// Emit changes for a Fix-It.`
`@@ -295,12 +297,12 @@ class PluginDiagnosticsEngine {`
`295`	`297`	`}`
`296`	`298`	`var newText = change.newText`
`297`	`299`	`newText.withBridgedString { bridgedFixItText in`
`298`		`- Diagnostic_fixItReplace(`
`299`		`- diag, startLoc, endLoc, bridgedFixItText)`
	`300`	`+ diag.fixItReplace(`
	`301`	`+ start: startLoc, end: endLoc, replacement: bridgedFixItText)`
`300`	`302`	`}`
`301`	`303`	`}`
`302`	`304`
`303`		`- Diagnostic_finish(diag)`
	`305`	`+ diag.finish()`
`304`	`306`	`}`
`305`	`307`
`306`	`308`	`/// Emit diagnostics.`
`@@ -339,7 +341,7 @@ class PluginDiagnosticsEngine {`
`339`	`341`	`guard let bufferBaseAddress = exportedSourceFile.pointee.buffer.baseAddress else {`
`340`	`342`	`return nil`
`341`	`343`	`}`
`342`		`- return SourceLoc_advanced(BridgedSourceLoc(raw: bufferBaseAddress), offset)`
	`344`	`+ return BridgedSourceLoc(raw: bufferBaseAddress).advanced(by: offset)`
`343`	`345`	`}`
`344`	`346`
`345`	`347`	`/// C++ source location from a position value from a plugin.`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ extension Parser.ExperimentalFeatures {`
`31`	`31`	`guard let context = context else { return }`
`32`	`32`
`33`	`33`	`func mapFeature(_ bridged: BridgedFeature, to feature: Self) {`
`34`		`- if ASTContext_langOptsHasFeature(context, bridged) {`
	`34`	`+ if context.langOptsHasFeature(bridged) {`
`35`	`35`	`insert(feature)`
`36`	`36`	`}`
`37`	`37`	`}`