ASTGen: adjust for type changes

The type definitions do not uniformly import as `Swift.Int` and `Swift.UInt`.  Add some casts to accommodate the type conversions.

Author: compnerd

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -1,4 +1,5 @@
 import CASTBridging
+import CBasicBridging
 import SwiftParser
 
 // Needed to use SyntaxTransformVisitor's visit method.
@@ -8,7 +9,7 @@ import SwiftSyntax
 extension Array {
   public func withBridgedArrayRef<T>(_ c: (BridgedArrayRef) -> T) -> T {
     withUnsafeBytes { buf in
-      c(BridgedArrayRef(data: buf.baseAddress!, numElements: count))
+      c(BridgedArrayRef(data: buf.baseAddress!, numElements: SwiftInt(count)))
     }
   }
 }

lib/ASTGen/Sources/ASTGen/Generics.swift

@@ -1,4 +1,5 @@
 import CASTBridging
+import CBasicBridging
 import SwiftParser
 
 // Needed to use SyntaxTransformVisitor's visit method.
@@ -37,7 +38,7 @@ extension ASTGenVisitor {
 
     return .decl(
       GenericTypeParamDecl_create(
-        self.ctx, self.declContext, name, nameLoc, eachLoc, genericParameterIndex,
+        self.ctx, self.declContext, name, nameLoc, eachLoc, SwiftInt(genericParameterIndex),
         eachLoc.raw != nil))
   }
 }

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -281,7 +281,7 @@ func checkMacroDefinition(
       if module == "Builtin" {
         switch type {
         case "ExternalMacro":
-          return BridgedMacroDefinitionKind.builtinExternalMacro.rawValue
+          return Int(BridgedMacroDefinitionKind.builtinExternalMacro.rawValue)
 
         default:
           // Warn about the unknown builtin.
@@ -326,7 +326,7 @@ func checkMacroDefinition(
           ]
         )
       )
-      return BridgedMacroDefinitionKind.externalMacro.rawValue
+      return Int(BridgedMacroDefinitionKind.externalMacro.rawValue)
 
     case let .expansion(expansionSyntax, replacements: _)
         where expansionSyntax.macroName.text == "externalMacro":
@@ -365,7 +365,7 @@ func checkMacroDefinition(
       // Form the "ModuleName.TypeName" result string.
       (externalMacroPointer.pointee, externalMacroLength.pointee) =
         allocateUTF8String("\(module).\(type)", nullTerminated: true)
-      return BridgedMacroDefinitionKind.externalMacro.rawValue
+      return Int(BridgedMacroDefinitionKind.externalMacro.rawValue)
 
     case let .expansion(expansionSyntax, replacements: replacements):
       // Provide the expansion syntax.
@@ -376,7 +376,7 @@ func checkMacroDefinition(
 
       // If there are no replacements, we're done.
       if replacements.isEmpty {
-        return BridgedMacroDefinitionKind.expandedMacro.rawValue
+        return Int(BridgedMacroDefinitionKind.expandedMacro.rawValue)
       }
 
       // The replacements are triples: (startOffset, endOffset, parameter index).
@@ -391,7 +391,7 @@ func checkMacroDefinition(
 
       replacementsPtr.pointee = replacementBuffer.baseAddress
       numReplacementsPtr.pointee = replacements.count
-      return BridgedMacroDefinitionKind.expandedMacro.rawValue
+      return Int(BridgedMacroDefinitionKind.expandedMacro.rawValue)
     }
   } catch let errDiags as DiagnosticsError {
     let srcMgr = SourceManager(cxxDiagnosticEngine: diagEnginePtr)

lib/ASTGen/Sources/ASTGen/Misc.swift

@@ -1,4 +1,5 @@
 import CASTBridging
+import CBasicBridging
 import SwiftParser
 
 // Needed to use SyntaxTransformVisitor's visit method.
@@ -65,7 +66,7 @@ extension BridgedSourceLoc {
   ) {
     if let start = buffer.baseAddress,
       position.utf8Offset >= 0 && position.utf8Offset < buffer.count {
-      self = SourceLoc_advanced(BridgedSourceLoc(raw: start), position.utf8Offset)
+      self = SourceLoc_advanced(BridgedSourceLoc(raw: start), SwiftInt(position.utf8Offset))
     } else {
       self = nil
     }
@@ -75,7 +76,7 @@ extension BridgedSourceLoc {
 extension String {
   mutating func withBridgedString<R>(_ body: (BridgedString) throws -> R) rethrows -> R {
     try withUTF8 { buffer in
-      try body(BridgedString(data: buffer.baseAddress, length: buffer.count))
+      try body(BridgedString(data: buffer.baseAddress, length: SwiftInt(buffer.count)))
     }
   }
 }

lib/ASTGen/Sources/ASTGen/PluginHost.swift

@@ -121,7 +121,7 @@ struct CompilerPlugin {
 
   private func sendMessage(_ message: HostToPluginMessage) throws {
     let hadError = try LLVMJSON.encoding(message) { (data) -> Bool in
-      return Plugin_sendMessage(opaqueHandle, BridgedData(baseAddress: data.baseAddress, size: UInt(data.count)))
+      return Plugin_sendMessage(opaqueHandle, BridgedData(baseAddress: data.baseAddress, size: SwiftUInt(data.count)))
     }
     if hadError {
       throw PluginError.failedToSendMessage
@@ -339,7 +339,7 @@ class PluginDiagnosticsEngine {
     guard let bufferBaseAddress = exportedSourceFile.pointee.buffer.baseAddress else {
       return nil
     }
-    return SourceLoc_advanced(BridgedSourceLoc(raw: bufferBaseAddress), offset)
+    return SourceLoc_advanced(BridgedSourceLoc(raw: bufferBaseAddress), SwiftInt(offset))
   }
 
   /// C++ source location from a position value from a plugin.