Update 5.3 to build with Xcode 12 beta

shahmishal · shahmishal · commit 90e874061359 · 2020-06-22T15:51:03.000-07:00
diff --git a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
@@ -660,8 +660,11 @@ function (swift_benchmark_compile_archopts)
           "-m${triple_platform}-version-min=${ver}"
           "-lobjc"
           "-L${SWIFT_LIBRARY_PATH}/${BENCH_COMPILE_ARCHOPTS_PLATFORM}"
+          "-L${sdk}/usr/lib/swift"
           "-Xlinker" "-rpath"
           "-Xlinker" "${SWIFT_LINK_RPATH}"
+          "-Xlinker" "-rpath"
+          "-Xlinker" "/usr/lib/swift"
           ${bench_library_objects}
           ${bench_driver_objects}
           ${ld64_add_ast_path_opts}
diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -1101,6 +1101,8 @@ function(_add_swift_target_library_single target name)
       list(APPEND library_search_directories "$ENV{SDKROOT}/usr/lib/swift")
   endif()
 
+  list(APPEND library_search_directories "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/usr/lib/swift")
+
   # Add variant-specific flags.
   if(SWIFTLIB_SINGLE_TARGET_LIBRARY)
     set(build_type "${SWIFT_STDLIB_BUILD_TYPE}")
diff --git a/stdlib/public/Differentiation/FloatingPointDifferentiation.swift.gyb b/stdlib/public/Differentiation/FloatingPointDifferentiation.swift.gyb
@@ -21,7 +21,7 @@ bits = self_type.bits
 
 def Availability(bits):
     if bits == 16:
-        return '@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)'
+        return '@available(macOS 10.16, iOS 14.0, tvOS 14.0, watchOS 7.0, *)'
     return ''
 }%
 
diff --git a/stdlib/public/core/Availability.swift b/stdlib/public/core/Availability.swift
@@ -42,3 +42,20 @@ public func _stdlib_isOSVersionAtLeast(
   return false._value
 #endif
 }
+
+#if os(macOS)
+// This is a magic entry point known to the compiler. It is called in
+// generated code for API availability checking.
+@_semantics("availability.osversion")
+@_effects(readnone)
+public func _stdlib_isOSVersionAtLeastOrVariantVersionAtLeast(
+  _ major: Builtin.Word,
+  _ minor: Builtin.Word,
+  _ patch: Builtin.Word,
+  _ variantMajor: Builtin.Word,
+  _ variantMinor: Builtin.Word,
+  _ variantPatch: Builtin.Word
+  ) -> Builtin.Int1 {
+  return _stdlib_isOSVersionAtLeast(major, minor, patch)
+}
+#endif
diff --git a/stdlib/public/core/CTypes.swift b/stdlib/public/core/CTypes.swift
@@ -57,7 +57,7 @@ public typealias CLong = Int
 public typealias CLongLong = Int64
 
 /// The C '_Float16' type.
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 public typealias CFloat16 = Float16
 
 /// The C 'float' type.
diff --git a/stdlib/public/core/Codable.swift b/stdlib/public/core/Codable.swift
@@ -4730,7 +4730,7 @@ extension RawRepresentable where RawValue == Float, Self: Decodable {
   }
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 extension Float16: Codable {
   /// Creates a new instance by decoding from the given decoder.
   ///
diff --git a/stdlib/public/core/FloatingPointParsing.swift.gyb b/stdlib/public/core/FloatingPointParsing.swift.gyb
@@ -46,7 +46,7 @@ internal func _isspace_clocale(_ u: UTF16.CodeUnit) -> Bool {
 
 //===--- Parsing ----------------------------------------------------------===//
 %if bits == 16:
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %end
 extension ${Self}: LosslessStringConvertible {
   /// Creates a new instance from the given string.
@@ -134,7 +134,7 @@ extension ${Self}: LosslessStringConvertible {
   %if bits == 16:
     self.init(Substring(text))
   %else:
-    if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+    if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
       self.init(Substring(text))
     } else {
       self = 0.0
@@ -164,7 +164,7 @@ extension ${Self}: LosslessStringConvertible {
   // In particular, we still have to export
   // _swift_stdlib_strtoXYZ_clocale()
   // as ABI to support old compiled code that still requires it.
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public init?(_ text: Substring) {
     self = 0.0
     let success = withUnsafeMutablePointer(to: &self) { p -> Bool in
diff --git a/stdlib/public/core/FloatingPointTypes.swift.gyb b/stdlib/public/core/FloatingPointTypes.swift.gyb
@@ -39,7 +39,7 @@ RawSignificand = 'UInt' + str(SignificandSize)
 
 def Availability(bits):
     if bits == 16:
-        return '@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)'
+        return '@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)'
     return ''
 
 if Self == 'Float16':
diff --git a/stdlib/public/core/IntegerTypes.swift.gyb b/stdlib/public/core/IntegerTypes.swift.gyb
@@ -1152,7 +1152,7 @@ public struct ${Self}
   ///   `source` must be representable in this type after rounding toward
   ///   zero.
 %     if FloatType == 'Float16':
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %     end
   @_transparent
   public init(_ source: ${FloatType}) {
@@ -1182,7 +1182,7 @@ public struct ${Self}
   ///
   /// - Parameter source: A floating-point value to convert to an integer.
 %     if FloatType == 'Float16':
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %     end
   @_transparent
   public init?(exactly source: ${FloatType}) {
diff --git a/stdlib/public/core/Misc.swift b/stdlib/public/core/Misc.swift
@@ -78,13 +78,13 @@ func _typeName(_ type: Any.Type, qualified: Bool = true) -> String {
     UnsafeBufferPointer(start: stringPtr, count: count)).0
 }
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 @_silgen_name("swift_getMangledTypeName")
 public func _getMangledTypeName(_ type: Any.Type)
   -> (UnsafePointer<UInt8>, Int)
 
 /// Returns the mangled name for a given type.
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 public // SPI
 func _mangledTypeName(_ type: Any.Type) -> String? {
   let (stringPtr, count) = _getMangledTypeName(type)
diff --git a/stdlib/public/core/RangeReplaceableCollection.swift b/stdlib/public/core/RangeReplaceableCollection.swift
@@ -1138,3 +1138,4 @@ extension RangeReplaceableCollection {
     self = try filter { try !shouldBeRemoved($0) }
   }
 }
+
diff --git a/stdlib/public/core/Runtime.swift b/stdlib/public/core/Runtime.swift
@@ -303,7 +303,7 @@ internal func _float16ToStringImpl(
   _ debug: Bool
 ) -> Int
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 internal func _float16ToString(
   _ value: Float16,
   debug: Bool
diff --git a/stdlib/public/core/SIMDVectorTypes.swift.gyb b/stdlib/public/core/SIMDVectorTypes.swift.gyb
@@ -253,7 +253,7 @@ extension ${Self}: SIMDScalar {
 
 %for (Self, bits) in [('Float16',16), ('Float',32), ('Double',64)]:
 %if bits == 16:
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 %end
 extension ${Self} : SIMDScalar {
 
diff --git a/stdlib/public/core/String.swift b/stdlib/public/core/String.swift
@@ -501,7 +501,7 @@ extension String {
   ///     memory with room for `capacity` UTF-8 code units, initializes
   ///     that memory, and returns the number of initialized elements.
   @inline(__always)
-  @available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
   public init(
     unsafeUninitializedCapacity capacity: Int,
     initializingUTF8With initializer: (
diff --git a/test/ClangImporter/cfuncs_parse.swift b/test/ClangImporter/cfuncs_parse.swift
@@ -72,7 +72,7 @@ func test_powl() {
 }
 #endif
 
-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)
+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
 func test_f16() {
   var x = Float16.zero
   f16ptrfunc(&x)
diff --git a/test/Driver/verbose.swift b/test/Driver/verbose.swift
@@ -1,4 +1,4 @@
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-linux-gnu -v %s 2>&1 | %FileCheck %s -check-prefix=VERBOSE_CLANG
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-unknown-windows-msvc -v %s 2>&1 | %FileCheck %s -check-prefix=VERBOSE_CLANG
 
-// VERBOSE_CLANG: clang{{.*}} -v -o
+// VERBOSE_CLANG: clang{{.*}} -v {{.*}}-o
diff --git a/test/IRGen/class_update_callback_without_fixed_layout.sil b/test/IRGen/class_update_callback_without_fixed_layout.sil
@@ -5,6 +5,7 @@
 // RUN: %target-swift-frontend  -I %t -emit-ir -enable-library-evolution -O %s -target %target-pre-stable-abi-triple
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 // UNSUPPORTED: CPU=arm64e
 
 // With the old deployment target, these classes use the 'singleton' metadata
diff --git a/test/IRGen/eager-class-initialization.swift b/test/IRGen/eager-class-initialization.swift
@@ -3,6 +3,7 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -target %target-pre-stable-abi-triple | %FileCheck %s -DINT=i%target-ptrsize --check-prefix=CHECK --check-prefix=CHECK-OLD
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 // UNSUPPORTED: CPU=arm64e
 
 // See also eager-class-initialization-stable-abi.swift, for the stable ABI
diff --git a/test/Interpreter/SDK/CGImportAsMember.swift b/test/Interpreter/SDK/CGImportAsMember.swift
@@ -12,9 +12,9 @@ class Colors {
 
 	class func printColors() {
 		print("Colors") // CHECK: Colors
-		print(black)    // CHECK: Generic Gray Profile
-		print(white)    // CHECK: Generic Gray Profile
-		print(clear)    // CHECK: Generic Gray Profile
+		print(black)    // CHECK: Generic Gray
+		print(white)    // CHECK: Generic Gray
+		print(clear)    // CHECK: Generic Gray
 	}
 }
 
diff --git a/test/Interpreter/SDK/autolinking.swift b/test/Interpreter/SDK/autolinking.swift
@@ -36,7 +36,11 @@ if global() != 42 {
 
 let RTLD_DEFAULT = UnsafeMutableRawPointer(bitPattern: -2)
 if dlsym(RTLD_DEFAULT, "global") == nil {
-  print(String(cString: dlerror()))
+  if let err = dlerror() {
+    print(String(cString: err))
+  } else {
+    print("Unknown dlsym error")
+  }
   exit(EXIT_FAILURE)
 }
 #endif
diff --git a/test/Interpreter/generic_casts.swift b/test/Interpreter/generic_casts.swift
@@ -181,7 +181,7 @@ func nongenericAnyAsConditionalPAndPCSubConforming(type: Any.Type) -> Bool {
 func genericAnyAsConditional<T>(type: Any.Type, to: T.Type, expected: Bool) -> Bool {
   // If we're testing against a runtime that doesn't have the fix this tests,
   // just pretend we got it right.
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     return (type as? T.Type) != nil
   } else {
     return expected
@@ -207,7 +207,7 @@ func nongenericAnyAsUnconditionalPAndPCSubConforming(type: Any.Type) -> Bool {
   return true
 }
 func genericAnyAsUnconditional<T>(type: Any.Type, to: T.Type, expected: Bool) -> Bool {
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     blackhole(type as! T.Type)
   }
   return true
diff --git a/test/PrintAsObjC/resilient-ancestry.swift b/test/PrintAsObjC/resilient-ancestry.swift
@@ -11,6 +11,7 @@
 // RUN: %check-in-clang %t/resilient.h -I %t
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 
 // See also resilient-ancestry.swift, for the stable ABI deployment target test.
 
diff --git a/test/Runtime/demangleToMetadata.swift b/test/Runtime/demangleToMetadata.swift
@@ -441,7 +441,7 @@ DemangleToMetadataTests.test("Nested types in same-type-constrained extensions")
   // V !: P3 in InnerTEqualsConformsToP1
 }
 
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
   DemangleToMetadataTests.test("Round-trip with _mangledTypeName and _typeByName") {
     func roundTrip<T>(_ type: T.Type) {
       let mangledName: String? = _mangledTypeName(type)
diff --git a/test/attr/attr_objc_resilience.swift b/test/attr/attr_objc_resilience.swift
@@ -4,6 +4,7 @@
 // RUN: %target-swift-frontend -typecheck -verify %s -I %t
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 
 import Foundation
 import resilient_objc_class
diff --git a/test/decl/protocol/conforms/nscoding.swift b/test/decl/protocol/conforms/nscoding.swift
@@ -8,6 +8,7 @@
 // RUN: %FileCheck --check-prefix=NEGATIVE %s < %t/old.ast
 
 // REQUIRES: objc_interop
+// UNSUPPORTED: OS=iosmac
 // UNSUPPORTED: CPU=arm64e
 
 // See also nscoding_stable_abi.swift, for the stable ABI deployment
diff --git a/test/lit.cfg b/test/lit.cfg
@@ -409,7 +409,7 @@ if kIsWindows:
                                                                            config.swift_driver_test_options)) )
 else:
     config.substitutions.append( ('%swift_driver', "env SDKROOT= %r %s %s %s" % (config.swift, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
-    config.substitutions.append( ('%swiftc_driver', "env SDKROOT= %r -toolchain-stdlib-rpath %s %s %s" % (config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
+    config.substitutions.append( ('%swiftc_driver', "env SDKROOT= %r -toolchain-stdlib-rpath -Xlinker -rpath -Xlinker /usr/lib/swift %s %s %s" % (config.swiftc, mcp_opt, config.swift_test_options, config.swift_driver_test_options)) )
 config.substitutions.append( ('%sil-opt', "%r %s %s" % (config.sil_opt, mcp_opt, config.sil_test_options)) )
 config.substitutions.append( ('%sil-func-extractor', "%r %s" % (config.sil_func_extractor, mcp_opt)) )
 config.substitutions.append( ('%sil-llvm-gen', "%r %s" % (config.sil_llvm_gen, mcp_opt)) )
@@ -849,7 +849,9 @@ if run_vendor == 'apple':
 
        config.target_build_swift = (
            ("%s %s %s -F %r -toolchain-stdlib-rpath " +
-            "-Xlinker -rpath -Xlinker %r %s %s %s %s") %
+            "-Xlinker -rpath -Xlinker %r " +
+            "-Xlinker -rpath -Xlinker /usr/lib/swift " +
+            "%s %s %s %s") %
            (xcrun_prefix, config.swiftc, target_options,
             extra_frameworks_dir,
             "/tmp/swifttest-device/lib",
@@ -886,7 +888,9 @@ if run_vendor == 'apple':
             (run_cpu, run_os, run_vers, clang_mcp_opt))
 
         config.target_build_swift = (
-            "%s %s %s -F %r -toolchain-stdlib-rpath %s %s %s %s" %
+            ("%s %s %s -F %r -toolchain-stdlib-rpath %s " +
+             "-Xlinker -rpath -Xlinker /usr/lib/swift " +
+             " %s %s %s") %
             (xcrun_prefix, config.swiftc, target_options,
              extra_frameworks_dir,
              sdk_overlay_linker_opt, config.swift_test_options,
@@ -943,7 +947,9 @@ if run_vendor == 'apple':
 
         config.target_build_swift = (
             ("%s %s %s %s -F %r -toolchain-stdlib-rpath "
-             + "-Xlinker -rpath -Xlinker %r %s %s %s %s "
+             + "-Xlinker -rpath -Xlinker %r "
+             + "-Xlinker -rpath -Xlinker /usr/lib/swift "
+             + "%s %s %s %s "
              + "-F %r -Xlinker -rpath -Xlinker %r")
             % (xcrun_prefix, config.swiftc, target_options,
                maccatalyst_frameworks_component,
@@ -1007,7 +1013,8 @@ if run_vendor == 'apple':
     subst_target_swift_ide_test_mock_sdk_after = \
         target_options_for_mock_sdk_after
     config.target_swiftc_driver = (
-        "%s %s -toolchain-stdlib-rpath %s" %
+        ("%s %s -toolchain-stdlib-rpath %s " +
+         "-Xlinker -rpath -Xlinker /usr/lib/swift ")%
         (xcrun_prefix, config.swiftc, target_options))
     config.target_clang = (
         "%s clang++ %s" %
diff --git a/test/stdlib/Casts.swift b/test/stdlib/Casts.swift
@@ -84,7 +84,7 @@ CastsTests.test("Optional<T>.none can be casted to Optional<U>.none in generic c
 #if _runtime(_ObjC)
 protocol P2 {}
 CastsTests.test("Cast from ObjC existential to Protocol (SR-3871)") {
-  if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     struct S: P2 {}
 
     class ObjCWrapper {
diff --git a/test/stdlib/EmptyCollectionSingletonRealization.swift b/test/stdlib/EmptyCollectionSingletonRealization.swift
@@ -25,7 +25,7 @@ import Foundation
 @objc protocol P {}
 
 
-if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
   do {
     let d: [NSObject: NSObject] = [:]
     let c: AnyClass? = object_getClass(d)
@@ -53,4 +53,4 @@ if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
   print("Dictionary: false")
   print("Array: false")
   print("Set: false")
-}
+}
diff --git a/test/stdlib/ErrorBridged.swift b/test/stdlib/ErrorBridged.swift
@@ -849,7 +849,7 @@ ErrorBridgingTests.test("Swift Error bridged to NSError description") {
     expectEqual("Something", bridgedError.description)
   }
 
-  if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     checkDescription()
   }
 }
@@ -880,7 +880,7 @@ ErrorBridgingTests.test("Swift Error description memory management") {
     }
   }
 
-  if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+  if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
     checkDescription()
   }
 }
diff --git a/test/stdlib/Inputs/FloatingPointConversion.swift.gyb b/test/stdlib/Inputs/FloatingPointConversion.swift.gyb
diff --git a/test/stdlib/Mirror.swift b/test/stdlib/Mirror.swift
diff --git a/test/stdlib/NSValueBridging.swift.gyb b/test/stdlib/NSValueBridging.swift.gyb
diff --git a/test/stdlib/OptionSetTest.swift b/test/stdlib/OptionSetTest.swift
diff --git a/test/stdlib/PrintFloat.swift.gyb b/test/stdlib/PrintFloat.swift.gyb
diff --git a/test/stdlib/StringCreate.swift b/test/stdlib/StringCreate.swift
diff --git a/test/stdlib/TestData.swift b/test/stdlib/TestData.swift
diff --git a/test/stdlib/TestDecimal.swift b/test/stdlib/TestDecimal.swift
diff --git a/test/stdlib/subString.swift b/test/stdlib/subString.swift
diff --git a/validation-test/stdlib/UnsafeBufferPointer.swift.gyb b/validation-test/stdlib/UnsafeBufferPointer.swift.gyb

Original file line number	Diff line number	Diff line change
`@@ -4730,7 +4730,7 @@ extension RawRepresentable where RawValue == Float, Self: Decodable {`
`4730`	`4730`	`}`
`4731`	`4731`	`}`
`4732`	`4732`
`4733`		`-@available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *)`
	`4733`	`+@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)`
`4734`	`4734`	`extension Float16: Codable {`
`4735`	`4735`	`/// Creates a new instance by decoding from the given decoder.`
`4736`	`4736`	`///`