Merge pull request apple#157 from stephentyrone/float16-availability-…

…redux Swap availability for #if check on Float16.
saltyJeff · Sep 18, 2020 · 6b24333 · 6b24333
2 parents 3d7462a + e07b394
commit 6b24333
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/Sources/RealModule/Float16+Real.swift b/Sources/RealModule/Float16+Real.swift
@@ -9,12 +9,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if swift(>=5.3)
+#if swift(>=5.3) && !(os(macOS) || os(iOS) && targetEnvironment(macCatalyst))
 import _NumericsShims
 
 @available(iOS 14.0, tvOS 14.0, watchOS 7.0, *)
-@available(macOS, unavailable)
-@available(macCatalyst, unavailable)
 extension Float16: Real {
   @_transparent
   public static func cos(_ x: Float16) -> Float16 {

diff --git a/Sources/_TestSupport/RealTestSupport.swift b/Sources/_TestSupport/RealTestSupport.swift
@@ -86,10 +86,8 @@ public protocol FixedWidthFloatingPoint: BinaryFloatingPoint
 where Exponent: FixedWidthInteger,
       RawSignificand: FixedWidthInteger { }
 
-#if swift(>=5.3)
+#if swift(>=5.3) && !(os(macOS) || os(iOS) && targetEnvironment(macCatalyst))
 @available(iOS 14.0, watchOS 14.0, tvOS 7.0, *)
-@available(macOS, unavailable)
-@available(macCatalyst, unavailable)
 extension Float16: FixedWidthFloatingPoint { }
 #endif
 

diff --git a/Tests/RealTests/ElementaryFunctionChecks.swift b/Tests/RealTests/ElementaryFunctionChecks.swift
@@ -60,7 +60,7 @@ internal extension Real where Self: BinaryFloatingPoint {
 
 final class ElementaryFunctionChecks: XCTestCase {
 
-  #if swift(>=5.3) && !os(macOS)
+  #if swift(>=5.3) && !(os(macOS) || os(iOS) && targetEnvironment(macCatalyst))
   func testFloat16() {
     if #available(iOS 14.0, watchOS 14.0, tvOS 7.0, *) {
       Float16.elementaryFunctionChecks()

diff --git a/Tests/RealTests/IntegerExponentTests.swift b/Tests/RealTests/IntegerExponentTests.swift
@@ -77,9 +77,8 @@ internal extension Real where Self: FixedWidthFloatingPoint {
   }
 }
 
-#if swift(>=5.3)
+#if swift(>=5.3) && !(os(macOS) || os(iOS) && targetEnvironment(macCatalyst))
 @available(iOS 14.0, watchOS 14.0, tvOS 7.0, *)
-@available(macOS, unavailable)
 extension Float16 {
   static func testIntegerExponent() {
     testIntegerExponentCommon()
@@ -174,8 +173,8 @@ extension Double {
 }
 
 final class IntegerExponentTests: XCTestCase {
-
-  #if swift(>=5.3) && !os(macOS)
+  
+  #if swift(>=5.3) && !(os(macOS) || os(iOS) && targetEnvironment(macCatalyst))
   func testFloat16() {
     Float16.testIntegerExponent()
   }

diff --git a/Tests/WindowsMain.swift b/Tests/WindowsMain.swift
@@ -32,7 +32,7 @@ extension RealTests.ApproximateEqualityTests {
   ])
 }
 
-#if swift(>=5.3)
+#if swift(>=5.3) && !(os(macOS) || os(iOS) && targetEnvironment(macCatalyst))
 extension ElementaryFunctionChecks {
   static var all = testCase([
     ("testFloat16", ElementaryFunctionChecks.testFloat16),
@@ -49,7 +49,7 @@ extension ElementaryFunctionChecks {
 }
 #endif
 
-#if swift(>=5.3)
+#if swift(>=5.3) && !(os(macOS) || os(iOS) && targetEnvironment(macCatalyst))
 extension IntegerExponentTests {
   static var all = testCase([
     ("testFloat16", IntegerExponentTests.testFloat16),