[stdlib] Fix ABI and portability issues

lorentey · lorentey · commit cb2194c024d9 · 2022-04-13T19:15:30.000-07:00
diff --git a/stdlib/public/core/StringUnicodeScalarView.swift b/stdlib/public/core/StringUnicodeScalarView.swift
@@ -319,7 +319,7 @@ extension String {
     @inline(__always) get { return UnicodeScalarView(_guts) }
     @inline(__always) set { _guts = newValue._guts }
 
-    @_alwaysEmitIntoClient @inline(__always) // 5.7
+    @inlinable @inline(__always)
     _modify {
       var view = self.unicodeScalars
       self = ""
diff --git a/stdlib/public/core/Substring.swift b/stdlib/public/core/Substring.swift
@@ -141,7 +141,7 @@ extension Substring {
   @inlinable @inline(__always)
   internal var _offsetRange: Range<Int> { _slice._bounds._encodedOffsetRange }
 
-  @inlinable @inline(__always)
+  @_alwaysEmitIntoClient @inline(__always)
   internal var _bounds: Range<Index> { _slice._bounds }
 }
 
diff --git a/test/stdlib/StringIndex.swift b/test/stdlib/StringIndex.swift
@@ -604,12 +604,13 @@ suite.test("Fully exhaustive index interchange")
   fullyExhaustiveIndexInterchange(string)
 }
 
+#if _runtime(_ObjC)
 suite.test("Fully exhaustive index interchange/GraphemeBreakTests") {
   for string in graphemeBreakTests.map { $0.0 } {
     fullyExhaustiveIndexInterchange(string)
   }
 }
-
+#endif
 
 suite.test("Global vs local grapheme cluster boundaries") {
   guard #available(SwiftStdlib 5.7, *) else {

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ extension Substring {`
`141`	`141`	`@inlinable @inline(__always)`
`142`	`142`	`internal var _offsetRange: Range<Int> { _slice._bounds._encodedOffsetRange }`
`143`	`143`
`144`		`- @inlinable @inline(__always)`
	`144`	`+ @_alwaysEmitIntoClient @inline(__always)`
`145`	`145`	`internal var _bounds: Range<Index> { _slice._bounds }`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -604,12 +604,13 @@ suite.test("Fully exhaustive index interchange")`
`604`	`604`	`fullyExhaustiveIndexInterchange(string)`
`605`	`605`	`}`
`606`	`606`
	`607`	`+#if _runtime(_ObjC)`
`607`	`608`	`suite.test("Fully exhaustive index interchange/GraphemeBreakTests") {`
`608`	`609`	`for string in graphemeBreakTests.map { $0.0 } {`
`609`	`610`	`fullyExhaustiveIndexInterchange(string)`
`610`	`611`	`}`
`611`	`612`	`}`
`612`		`-`
	`613`	`+#endif`
`613`	`614`
`614`	`615`	`suite.test("Global vs local grapheme cluster boundaries") {`
`615`	`616`	`guard #available(SwiftStdlib 5.7, *) else {`