Skip to content

Make Float16 unavailable on macOS and macCatalyst, as in Apple Swift #32868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2020
Merged

Make Float16 unavailable on macOS and macCatalyst, as in Apple Swift #32868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions stdlib/public/Differentiation/FloatingPointDifferentiation.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ bits = self_type.bits

def Availability(bits):
if bits == 16:
return '@available(macOS 10.16, iOS 14.0, tvOS 14.0, watchOS 7.0, *)'
return '@available(iOS 14.0, tvOS 14.0, watchOS 7.0, *)'
return ''
}%

% if bits == 80:
#if !(os(Windows) || os(Android)) && (arch(i386) || arch(x86_64))
% end
% if bits == 16:
#if !os(macOS) && !(os(iOS) && targetEnvironment(macCatalyst))
% end

//===----------------------------------------------------------------------===//
// Protocol conformances
Expand Down Expand Up @@ -253,7 +256,7 @@ extension ${Self} {
}
}

% if bits == 80:
% if bits == 80 or bits == 16:
#endif
% end
% end
Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/core/CTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ public typealias CLong = Int
public typealias CLongLong = Int64

/// The C '_Float16' type.
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
public typealias CFloat16 = Float16

/// The C 'float' type.
Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/core/Codable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4730,7 +4730,9 @@ extension RawRepresentable where RawValue == Float, Self: Decodable {
}
}

@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
extension Float16: Codable {
/// Creates a new instance by decoding from the given decoder.
///
Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/core/FloatingPointParsing.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ internal func _isspace_clocale(_ u: UTF16.CodeUnit) -> Bool {

//===--- Parsing ----------------------------------------------------------===//
%if bits == 16:
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
%end
extension ${Self}: LosslessStringConvertible {
/// Creates a new instance from the given string.
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/core/FloatingPointTypes.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RawSignificand = 'UInt' + str(SignificandSize)

def Availability(bits):
if bits == 16:
return '@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)'
return '@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)\n@available(macOS, unavailable)\n@available(macCatalyst, unavailable)'
return ''

if Self == 'Float16':
Expand Down
8 changes: 6 additions & 2 deletions stdlib/public/core/IntegerTypes.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,9 @@ public struct ${Self}
/// `source` must be representable in this type after rounding toward
/// zero.
% if FloatType == 'Float16':
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
% end
@_transparent
public init(_ source: ${FloatType}) {
Expand Down Expand Up @@ -1182,7 +1184,9 @@ public struct ${Self}
///
/// - Parameter source: A floating-point value to convert to an integer.
% if FloatType == 'Float16':
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
% end
@_transparent
public init?(exactly source: ${FloatType}) {
Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/core/Runtime.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,9 @@ internal func _float16ToStringImpl(
_ debug: Bool
) -> Int

@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
internal func _float16ToString(
_ value: Float16,
debug: Bool
Expand Down
4 changes: 3 additions & 1 deletion stdlib/public/core/SIMDVectorTypes.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,9 @@ extension ${Self}: SIMDScalar {

%for (Self, bits) in [('Float16',16), ('Float',32), ('Double',64)]:
%if bits == 16:
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
%end
extension ${Self} : SIMDScalar {

Expand Down
4 changes: 3 additions & 1 deletion test/ClangImporter/cfuncs_parse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,16 @@ func test_powl() {
}
#endif

@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
#if !os(macOS) && !(os(iOS) && targetEnvironment(macCatalyst))
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
func test_f16() {
var x = Float16.zero
f16ptrfunc(&x)
#if arch(arm) || arch(arm64)
f16func(x)
#endif
}
#endif

func test_puts(_ s: String) {
_ = s.withCString { puts($0) + 32 };
Expand Down
23 changes: 18 additions & 5 deletions test/stdlib/Inputs/FloatingPointConversion.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ var FloatingPointConversionFailures = TestSuite("FloatingPointToFloatingPointCon
% SelfSignificandBits = self_type.bits
% Self = self_type.stdlib_name

% if Self == 'Float16':
#if !os(macOS) && !(os(iOS) && targetEnvironment(macCatalyst))
% end
% if Self == 'Float80':
#if !os(Windows) && (arch(i386) || arch(x86_64))
% end
Expand All @@ -24,14 +27,17 @@ var FloatingPointConversionFailures = TestSuite("FloatingPointToFloatingPointCon
% OtherSignificandBits = other_type.bits
% OtherFloat = other_type.stdlib_name

% if OtherFloat == 'Float16':
#if !os(macOS) && !(os(iOS) && targetEnvironment(macCatalyst))
% end
% if OtherFloat == 'Float80':
#if !os(Windows) && (arch(i386) || arch(x86_64))
% end

% if OtherSignificandBits <= SelfSignificandBits:

% if OtherFloat == 'Float16':
if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
if #available(iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
% end
FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")

Expand All @@ -56,7 +62,7 @@ FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")
% else:

% if Self == 'Float16':
if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
if #available(iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
% end
FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")
.forEach(in: [
Expand All @@ -77,7 +83,7 @@ FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion")
% end

% if 'Float16' in [Self, OtherFloat]:
if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
if #available(iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
% end
FloatingPointConversionTruncations.test("${OtherFloat}To${Self}Conversion/special") {
expectEqual( 1.0 as ${Self}, ${Self}(exactly: 1.0 as ${OtherFloat}))
Expand Down Expand Up @@ -119,6 +125,9 @@ FloatingPointConversionFailures.test("${OtherFloat}To${Self}Conversion/AlwaysSuc
}
% end

% if OtherFloat == 'Float16':
#endif
% end
% if OtherFloat == 'Float80':
#endif
% end
Expand All @@ -138,7 +147,8 @@ _UnimplementedError()

extension ${OtherInt} {
% if Self == 'Float16':
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
% end
static var _test${Self}Conversion: [(${OtherInt}, ${OtherInt}, ${OtherInt}?)] {
if bitWidth > ${Self}.significandBitCount + 1 {
Expand All @@ -165,7 +175,7 @@ extension ${OtherInt} {
}

% if Self == 'Float16':
if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
if #available(iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
% end
FixedPointConversionTruncations.test("${OtherInt}to${Self}")
.forEach(in: ${OtherInt}._test${Self}Conversion) {
Expand All @@ -187,6 +197,9 @@ FixedPointConversionTruncations.test("${OtherInt}to${Self}")

% end # for in int_types

% if Self == 'Float16':
#endif
% end
% if Self == 'Float80':
#endif
% end
Expand Down
12 changes: 9 additions & 3 deletions test/stdlib/PrintFloat.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,9 @@ let PrintTests = TestSuite("FloatingPointPrinting")

% for FloatType in ['Float16', 'Float', 'Double', 'Float80']:
% if FloatType == 'Float16':
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
% end
% if FloatType == 'Float80':
#if !os(Windows) && (arch(i386) || arch(x86_64))
Expand Down Expand Up @@ -383,7 +385,9 @@ fileprivate func expectDescription(_ expected: String, _ object: ${FloatType},
// that is closest (as an infinitely-precise real number) to the original
// binary float (interpreted as an infinitely-precise real number).
% if FloatType == 'Float16':
@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(iOS 14.0, watchOS 7.0, tvOS 14.0, *)
@available(macOS, unavailable)
@available(macCatalyst, unavailable)
% end
fileprivate func expectAccurateDescription(_ object: ${FloatType},
_ message: @autoclosure () -> String = "",
Expand Down Expand Up @@ -584,7 +588,8 @@ PrintTests.test("Printable_CDouble") {
expectDescription("-1.0", CDouble(-1.0))
}

if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
#if !os(macOS) && !(os(iOS) && targetEnvironment(macCatalyst))
if #available(iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
PrintTests.test("Printable_Float16") {
func asFloat16(_ f: Float16) -> Float16 { return f }

Expand Down Expand Up @@ -727,6 +732,7 @@ PrintTests.test("Printable_Float16") {
expectDescription("0.0", asFloat16(0.0000000125))
}
}
#endif

PrintTests.test("Printable_Float") {
func asFloat32(_ f: Float32) -> Float32 { return f }
Expand Down