Skip to content

Commit efa6b3e

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents a3681a8 + c8f8736 commit efa6b3e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

test/stdlib/StringIndex.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,11 @@ if #available(SwiftStdlib 6.1, *) {
12431243
suite.test("String index debugDescription backdeployment") {
12441244
// Note: no availability check
12451245
let str = "i\u{308}"
1246-
expectEqual(str.startIndex.debugDescription, "0[any]")
1246+
// Result can be `any` or `unknown` depending on inlining behavior
1247+
expectTrue(
1248+
str.startIndex.debugDescription == "0[any]" ||
1249+
str.startIndex.debugDescription == "0[unknown]"
1250+
)
12471251
expectEqual(str.endIndex.debugDescription, "3[utf8]")
12481252
}
12491253

utils/build-windows-toolchain.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ if not "%SKIP_PACKAGING%"=="1" set "SkipPackagingArg= "
7272

7373
:: Build the -WindowsSDKArchitectures argument, if any, otherwise build all the SDKs.
7474
set "WindowsSDKArchitecturesArg= "
75-
if not "%WINDOWS_SDKS%"=="" set "WindowsSDKArchitecturesArg=-Windows -WindowsSDKArchitectures %WINDOWS_SDKS%"
75+
if not "%WINDOWS_SDKS%"=="" set "WindowsSDKArchitecturesArg=-Windows -WindowsSDKArchitectures %WINDOWS_SDKS% -WindowsSDKLinkModes dynamic"
7676

7777
:: Build the -HostArchName argument, if any.
7878
set "HostArchNameArg="

0 commit comments

Comments
 (0)