Merge pull request #560 from CodaFi/way-back-machine

Author: CodaFi

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.5
 
 import PackageDescription
 import Foundation
@@ -142,9 +142,11 @@ let package = Package(
   ]
 )
 
-// If `SWIFTCI_USE_LOCAL_DEPS` is set, we are in a CI enviornment that might disallow 
+#if swift(>=5.6)
+// If `SWIFTCI_USE_LOCAL_DEPS` is set, we are in a CI enviornment that might disallow
 // internet access, so we can't load swift-docc-plugin. Simply don't load it in these
 // environments because we don't build docc in CI at the moment.
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
     package.dependencies.append(.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"))
 }
+#endif

Sources/SwiftSyntax/BumpPtrAllocator.swift

@@ -119,7 +119,7 @@ public class BumpPtrAllocator {
   /// Check if the address is managed by this allocator.
   public func contains(address: UnsafeRawPointer) -> Bool {
     func test(_ slab: Slab) -> Bool {
-      slab.baseAddress! <= address && address < slab.baseAddress! + slab.count
+      UnsafeRawPointer(slab.baseAddress!) <= address && address < UnsafeRawPointer(slab.baseAddress!) + slab.count
     }
     return slabs.contains(where: test(_:)) || customSizeSlabs.contains(where: test(_:))
   }
@@ -145,3 +145,24 @@ public class BumpPtrAllocator {
     _totalBytesAllocated
   }
 }
+
+// MARK: Compatibilty Shims
+
+#if swift(<5.7)
+extension UnsafeMutableRawPointer {
+  /// Obtain the next pointer whose bit pattern is a multiple of alignment.
+  ///
+  /// - Parameter alignment: The alignment of the returned pointer, in bytes.
+  ///                        Alignment must be a whole power of 2.
+  /// - Returns: A pointer aligned to `alignment`.
+  fileprivate func alignedUp(toMultipleOf alignment: Int) -> Self {
+    let mask = UInt(alignment) &- 1
+    assert(
+      alignment > 0 && UInt(alignment) & mask == 0,
+      "alignment must be a whole power of 2."
+    )
+    let bits = (UInt(bitPattern: self) &+ mask) & ~mask
+    return .init(bitPattern: bits)!
+  }
+}
+#endif