[swiftSyntax] Pass userInfo as UnsafePointer

Author: ahoppen

tools/SwiftSyntax/ByteTreeDeserialization.swift

@@ -32,7 +32,7 @@ protocol ByteTreeScalarDecodable {
   ///   - size: The length of the serialized data in bytes
   /// - Returns: The deserialized value
   static func read(from pointer: UnsafeRawPointer, size: Int,
-                   userInfo: [ByteTreeUserInfoKey: Any]) -> Self
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>) -> Self
 }
 
 /// A type that can be deserialized from ByteTree into an object with child
@@ -49,7 +49,8 @@ protocol ByteTreeObjectDecodable {
   ///                object
   /// - Returns: The deserialized object
   static func read(from reader: UnsafeMutablePointer<ByteTreeObjectReader>,
-                   numFields: Int, userInfo: [ByteTreeUserInfoKey: Any]) -> Self
+                   numFields: Int,
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>) -> Self
 }
 
 // MARK: - Reader objects
@@ -271,7 +272,8 @@ struct ByteTreeReader {
     defer {
       objectReader.finalize()
     }
-    return T.read(from: &objectReader, numFields: numFields, userInfo: userInfo)
+    return T.read(from: &objectReader, numFields: numFields,
+                  userInfo: &userInfo)
   }
 
   /// Read the next field in the tree as a scalar of the specified type.
@@ -285,7 +287,7 @@ struct ByteTreeReader {
     defer {
       pointer = pointer.advanced(by: fieldSize)
     }
-    return T.read(from: pointer, size: fieldSize, userInfo: userInfo)
+    return T.read(from: pointer, size: fieldSize, userInfo: &userInfo)
   }
 
   /// Discard the next scalar field, advancing the pointer to the next field
@@ -309,7 +311,7 @@ struct ByteTreeReader {
 // multiple types
 extension ByteTreeScalarDecodable where Self : FixedWidthInteger {
   static func read(from pointer: UnsafeRawPointer, size: Int,
-                   userInfo: [ByteTreeUserInfoKey: Any]
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> Self {
     assert(size == MemoryLayout<Self>.size)
     return pointer.bindMemory(to: Self.self, capacity: 1).pointee
@@ -322,7 +324,8 @@ extension UInt32: ByteTreeScalarDecodable {}
 
 extension String: ByteTreeScalarDecodable {
   static func read(from pointer: UnsafeRawPointer, size: Int,
-                   userInfo: [ByteTreeUserInfoKey: Any]) -> String {
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
+  ) -> String {
     let data = Data(bytes: pointer, count: size)
     return String(data: data, encoding: .utf8)!
   }
@@ -332,7 +335,8 @@ extension Optional: ByteTreeObjectDecodable
   where
   Wrapped: ByteTreeObjectDecodable {
   static func read(from reader: UnsafeMutablePointer<ByteTreeObjectReader>,
-                   numFields: Int, userInfo: [ByteTreeUserInfoKey: Any]
+                   numFields: Int,
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> Optional<Wrapped> {
     if numFields == 0 {
       return nil
@@ -347,7 +351,8 @@ extension Array: ByteTreeObjectDecodable
   where
   Element: ByteTreeObjectDecodable {
   static func read(from reader: UnsafeMutablePointer<ByteTreeObjectReader>,
-                   numFields: Int, userInfo: [ByteTreeUserInfoKey: Any]
+                   numFields: Int,
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> Array<Element> {
     return (0..<numFields).map {
       return reader.pointee.readField(Element.self, index: $0)

tools/SwiftSyntax/RawSyntax.swift

@@ -396,7 +396,7 @@ extension RawSyntax: ByteTreeObjectDecodable {
     case omitted = 2
 
     static func read(from pointer: UnsafeRawPointer, size: Int,
-                     userInfo: [ByteTreeUserInfoKey: Any]
+                     userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
     ) -> SyntaxType {
       let rawValue = UInt8.read(from: pointer, size: size, userInfo: userInfo)
       guard let type = SyntaxType(rawValue: rawValue) else {
@@ -407,7 +407,8 @@ extension RawSyntax: ByteTreeObjectDecodable {
   }
 
   static func read(from reader: UnsafeMutablePointer<ByteTreeObjectReader>,
-                   numFields: Int, userInfo: [ByteTreeUserInfoKey: Any]
+                   numFields: Int,
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> RawSyntax {
     let syntaxNode: RawSyntax
     let type = reader.pointee.readField(SyntaxType.self, index: 0)
@@ -428,7 +429,7 @@ extension RawSyntax: ByteTreeObjectDecodable {
       syntaxNode = RawSyntax(kind: kind, layout: layout, presence: presence,
                              id: id)
     case .omitted:
-      guard let lookupFunc = userInfo[.omittedNodeLookupFunction] as?
+      guard let lookupFunc = userInfo.pointee[.omittedNodeLookupFunction] as?
         (SyntaxNodeId) -> RawSyntax? else {
           fatalError("omittedNodeLookupFunction is required when decoding an " +
                      "incrementally transferred syntax tree")
@@ -438,7 +439,7 @@ extension RawSyntax: ByteTreeObjectDecodable {
       }
       syntaxNode = lookupNode
     }
-    if let callback = userInfo[.rawSyntaxDecodedCallback] as?
+    if let callback = userInfo.pointee[.rawSyntaxDecodedCallback] as?
       (RawSyntax) -> Void {
       callback(syntaxNode)
     }
@@ -448,7 +449,7 @@ extension RawSyntax: ByteTreeObjectDecodable {
 
 extension SyntaxNodeId: ByteTreeScalarDecodable {
   static func read(from pointer: UnsafeRawPointer, size: Int,
-                   userInfo: [ByteTreeUserInfoKey: Any]
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> SyntaxNodeId {
     let rawValue = UInt32.read(from: pointer, size: size, userInfo: userInfo)
     return SyntaxNodeId(rawValue: UInt(rawValue))

tools/SwiftSyntax/SourcePresence.swift

@@ -26,7 +26,7 @@ public enum SourcePresence: String, Codable {
 
 extension SourcePresence: ByteTreeScalarDecodable {
   static func read(from pointer: UnsafeRawPointer, size: Int,
-                   userInfo: [ByteTreeUserInfoKey: Any]
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> SourcePresence {
     let rawValue = pointer.bindMemory(to: UInt8.self, capacity: 1).pointee
     switch rawValue {

tools/SwiftSyntax/SyntaxKind.swift.gyb

@@ -86,7 +86,7 @@ internal func makeSyntax(root: SyntaxData?, data: SyntaxData) -> Syntax {
 
 extension SyntaxKind: ByteTreeScalarDecodable {
   static func read(from pointer: UnsafeRawPointer, size: Int,
-                   userInfo: [ByteTreeUserInfoKey: Any]
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> SyntaxKind {
     // Explicitly spell out all SyntaxKinds to keep the serialized value stable
     // even if its members get reordered or members get removed

tools/SwiftSyntax/TokenKind.swift.gyb

@@ -112,7 +112,8 @@ extension TokenKind: Equatable {
 
 extension TokenKind: ByteTreeObjectDecodable {
   static func read(from reader: UnsafeMutablePointer<ByteTreeObjectReader>,
-                   numFields: Int, userInfo: [ByteTreeUserInfoKey: Any]
+                   numFields: Int,
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> TokenKind {
     // Explicitly spell out all TokenKinds to keep the serialized value stable
     // even if its members get reordered or members get removed

tools/SwiftSyntax/Trivia.swift.gyb

@@ -222,7 +222,8 @@ extension TriviaPiece {
 
 extension Trivia: ByteTreeObjectDecodable {
   static func read(from reader: UnsafeMutablePointer<ByteTreeObjectReader>,
-                   numFields: Int, userInfo: [ByteTreeUserInfoKey: Any]
+                   numFields: Int,
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> Trivia {
     let pieces = [TriviaPiece].read(from: reader, numFields: numFields,
                                     userInfo: userInfo)
@@ -232,7 +233,8 @@ extension Trivia: ByteTreeObjectDecodable {
 
 extension TriviaPiece: ByteTreeObjectDecodable {
   static func read(from reader: UnsafeMutablePointer<ByteTreeObjectReader>,
-                   numFields: Int, userInfo: [ByteTreeUserInfoKey: Any]
+                   numFields: Int,
+                   userInfo: UnsafePointer<[ByteTreeUserInfoKey: Any]>
   ) -> TriviaPiece {
     let kind = reader.pointee.readField(UInt8.self, index: 0)
     switch kind {