Merge pull request #39994 from lorentey/adopt-availability-macros

[stdlib] Adopt availability macros

Author: lorentey

lib/Parse/ParseDecl.cpp

@@ -1632,6 +1632,9 @@ Parser::parseAvailabilityMacro(SmallVectorImpl<AvailabilitySpec *> &Specs) {
  if (NameMatch == Map.end())
  return makeParserSuccess(); // No match, it could be a standard platform.
 
+ SyntaxParsingContext VersionRestrictionContext(
+ SyntaxContext, SyntaxKind::AvailabilityVersionRestriction);
+
  consumeToken();
 
  llvm::VersionTuple Version;

stdlib/private/StdlibCollectionUnittest/CheckMutableCollectionType.swift

@@ -982,7 +982,7 @@ self.test("\(testNamePrefix).partition/DispatchesThroughDirectStorageAccessors")
  withUnsafeMutableBufferPointerIsSupported ? 1 : 0,
  actualWUMBPIFNonNil + actualWCMSIAIFNonNil)
 
- if #available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *) {
+ if #available(SwiftStdlib 5.5, *) {
  // `partition(by:)` is expected to dispatch to the public API in releases
  // that contain https://github.com/apple/swift/pull/36003.
  expectEqual(0, actualWUMBPIF)

stdlib/private/StdlibUnittest/OpaqueIdentityFunctions.swift

@@ -66,7 +66,7 @@ public func getUInt64(_ x: UInt64) -> UInt64 { return _opaqueIdentity(x) }
 public func getUInt(_ x: UInt) -> UInt { return _opaqueIdentity(x) }
 
 #if !((os(macOS) || targetEnvironment(macCatalyst)) && arch(x86_64))
-@available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(SwiftStdlib 5.3, *)
 @inline(never)
 public func getFloat16(_ x: Float16) -> Float16 { return _opaqueIdentity(x) }
 #endif

stdlib/private/StdlibUnittest/StdlibCoreExtras.swift

@@ -270,7 +270,7 @@ public func _isStdlibDebugConfiguration() -> Bool {
 
 // Return true if the Swift runtime available is at least 5.1
 public func _hasSwift_5_1() -> Bool {
- if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+ if #available(SwiftStdlib 5.1, *) {
  return true
  }
  return false

stdlib/public/core/AnyHashable.swift

@@ -262,7 +262,7 @@ extension AnyHashable: CustomReflectable {
 }
 #endif
 
-@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+@available(SwiftStdlib 5.5, *)
 extension AnyHashable: _HasCustomAnyHashableRepresentation {
 }
 

stdlib/public/core/Assert.swift

@@ -311,7 +311,8 @@ internal func _internalInvariant_5_1(
  // FIXME: The below won't run the assert on 5.1 stdlib if testing on older
  // OSes, which means that testing may not test the assertion. We need a real
  // solution to this.
- guard #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) else { return }
+ guard #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) //SwiftStdlib 5.1
+ else { return }
  _internalInvariant(condition(), message, file: file, line: line)
 #endif
 }

stdlib/public/core/BridgeObjectiveC.swift

@@ -88,7 +88,7 @@ public protocol _ObjectiveCBridgeable {
 // Note: This function is not intended to be called from Swift. The
 // availability information here is perfunctory; this function isn't considered
 // part of the Stdlib's Swift ABI.
-@available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *)
+@available(SwiftStdlib 5.2, *)
 @_cdecl("_SwiftCreateBridgedArray")
 @usableFromInline
 internal func _SwiftCreateBridgedArray_DoNotCall(
@@ -103,7 +103,7 @@ internal func _SwiftCreateBridgedArray_DoNotCall(
 // Note: This function is not intended to be called from Swift. The
 // availability information here is perfunctory; this function isn't considered
 // part of the Stdlib's Swift ABI.
-@available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *)
+@available(SwiftStdlib 5.2, *)
 @_cdecl("_SwiftCreateBridgedMutableArray")
 @usableFromInline
 internal func _SwiftCreateBridgedMutableArray_DoNotCall(

stdlib/public/core/CTypes.swift

@@ -58,7 +58,7 @@ public typealias CLongLong = Int64
 
 #if !((os(macOS) || targetEnvironment(macCatalyst)) && arch(x86_64))
 /// The C '_Float16' type.
-@available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(SwiftStdlib 5.3, *)
 public typealias CFloat16 = Float16
 #endif
 

stdlib/public/core/Codable.swift

@@ -4732,7 +4732,7 @@ extension RawRepresentable where RawValue == Float, Self: Decodable {
 }
 
 #if !((os(macOS) || targetEnvironment(macCatalyst)) && arch(x86_64))
-@available(macOS 11.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(SwiftStdlib 5.3, *)
 extension Float16: Codable {
  /// Creates a new instance by decoding from the given decoder.
  ///

stdlib/public/core/CollectionDifference.swift

@@ -12,7 +12,7 @@
 
 /// A collection of insertions and removals that describe the difference 
 /// between two ordered collection states.
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 public struct CollectionDifference<ChangeElement> {
  /// A single change to a collection.
  @frozen
@@ -233,7 +233,7 @@ public struct CollectionDifference<ChangeElement> {
 /// }
 /// }
 /// ```
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference: Collection {
  public typealias Element = Change
 
@@ -281,7 +281,7 @@ extension CollectionDifference: Collection {
  }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Index: Equatable {
  @inlinable
  public static func == (
@@ -292,7 +292,7 @@ extension CollectionDifference.Index: Equatable {
  }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Index: Comparable {
  @inlinable
  public static func < (
@@ -303,27 +303,27 @@ extension CollectionDifference.Index: Comparable {
  }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Index: Hashable {
  @inlinable
  public func hash(into hasher: inout Hasher) {
  hasher.combine(_offset)
  }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Change: Equatable where ChangeElement: Equatable {}
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference: Equatable where ChangeElement: Equatable {}
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Change: Hashable where ChangeElement: Hashable {}
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference: Hashable where ChangeElement: Hashable {}
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference where ChangeElement: Hashable {
  /// Returns a new collection difference with associations between individual
  /// elements that have been removed and inserted only once.
@@ -380,7 +380,7 @@ extension CollectionDifference where ChangeElement: Hashable {
  }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Change: Codable where ChangeElement: Codable {
  private enum _CodingKeys: String, CodingKey {
  case offset
@@ -417,12 +417,12 @@ extension CollectionDifference.Change: Codable where ChangeElement: Codable {
  }
 }
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference: Codable where ChangeElement: Codable {}
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference: Sendable where ChangeElement: Sendable { }
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Change: Sendable where ChangeElement: Sendable { }
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+@available(SwiftStdlib 5.1, *)
 extension CollectionDifference.Index: Sendable where ChangeElement: Sendable { }