Merge pull request swiftlang#20381 from milseman/oldOS

[test] Fixup some tests for older OSes and other inconsequential changes

Author: milseman

stdlib/public/core/StringStorage.swift

@@ -187,7 +187,6 @@ private func determineCodeUnitCapacity(_ desiredCapacity: Int) -> Int {
 
 // Creation
 extension _StringStorage {
-  @inline(never) // rdar://problem/44542202
   @_effects(releasenone)
   private static func create(
     realCodeUnitCapacity: Int, countAndFlags: CountAndFlags

test/stdlib/Character.swift

@@ -105,18 +105,17 @@ testCharacters += [
   "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 10 bytes
 ]
 
-// Only run it on ObjC platforms. Supported Linux versions do not have a
-// recent enough ICU
-#if _runtime(_ObjC)
-testCharacters += [
-  "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 12 bytes
-  "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 14 bytes
-  "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 16 bytes
-
-  "👩🏽‍💼", // UTF-8: 15 bytes
-  "👩‍👩‍👦‍👦", // UTF-8: 25 bytes
-]
-#endif
+// Only run it on recent enough versions of ICU
+if #available(iOS 11.0, macOS 10.13, tvOS 11.0, watchOS 4.0, *) {
+  testCharacters += [
+    "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 12 bytes
+    "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 14 bytes
+    "\u{00a9}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}\u{0300}", // UTF-8: 16 bytes
+
+    "👩🏽‍💼", // UTF-8: 15 bytes
+    "👩‍👩‍👦‍👦", // UTF-8: 25 bytes
+  ]
+}
 
 func randomGraphemeCluster(_ minSize: Int, _ maxSize: Int) -> String {
   let n = Int.random(in: (minSize + 1) ..< maxSize)

test/stdlib/NewString.swift

@@ -108,7 +108,7 @@ func nonASCII() {
 
   // The storage of the slice implements NSString directly
   // CHECK-NOT: @[[utf16address]] = "❅❆❄︎⛄️"
-  // CHECK-NEXT: Swift._StringStorage@[[sliceAddress]] = "❅❆❄︎⛄️"
+  // CHECK-NEXT: {{.*}}StringStorage@[[sliceAddress]] = "❅❆❄︎⛄️"
   let nsSlice = slice as NSString
   print("  \(repr(nsSlice))")