Merge pull request #85201 from glessard/rdar158735546-again

glessard · web-flow · commit 82d66e388477 · 2025-10-30T19:20:24.000-07:00
diff --git a/test/stdlib/StringIndex.swift b/test/stdlib/StringIndex.swift
@@ -1248,7 +1248,11 @@ suite.test("String index debugDescription backdeployment") {
     str.startIndex.debugDescription == "0[any]" ||
     str.startIndex.debugDescription == "0[unknown]"
   )
-  expectEqual(str.endIndex.debugDescription, "3[utf8]")
+  // Result can be `utf8` or `unknown` depending on inlining behavior
+  expectTrue(
+    str.endIndex.debugDescription == "3[utf8]" ||
+    str.endIndex.debugDescription == "3[unknown]"
+  )
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1248,7 +1248,11 @@ suite.test("String index debugDescription backdeployment") {`
`1248`	`1248`	`str.startIndex.debugDescription == "0[any]" \|\|`
`1249`	`1249`	`str.startIndex.debugDescription == "0[unknown]"`
`1250`	`1250`	`)`
`1251`		`- expectEqual(str.endIndex.debugDescription, "3[utf8]")`
	`1251`	+ // Result can be `utf8` or `unknown` depending on inlining behavior
	`1252`	`+ expectTrue(`
	`1253`	`+ str.endIndex.debugDescription == "3[utf8]" \|\|`
	`1254`	`+ str.endIndex.debugDescription == "3[unknown]"`
	`1255`	`+ )`
`1252`	`1256`	`}`
`1253`	`1257`
`1254`	`1258`