From 2fc5cbdc14dfee3b27070d3f0c761e89f23b01d0 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 13 Oct 2020 20:20:30 -0700 Subject: [PATCH] stdlib: remove `swiftMSVCRT`, replace with `swiftCRT` on Windows This replaces swiftMSVCRT with swiftCRT. The big difference here is that the `visualc` module is no longer imported nor exported. The `visualc` module remains in use for a singular test wrt availability, but this should effectively remove the need for the `visualc` module. The difference between the MSVCRT and ucrt module was not well understood by most. MSVCRT provided ucrt AND visualc, combining pieces of the old MSVCRT and the newer ucrt. The ucrt module is what you really wanted most of the time, however, would need to use MSVCRT for the convenience aliases for type-generic math and the deprecated math constants. Unfortunately, we cannot shadow the `ucrt` module and create a Swift SDK overlay for ucrt as that seems to result in circular dependencies when processing the `_Concurrency` module. Although this makes using the C library easier for most people, it has a more important subtle change: it cleaves the dependency on visualc. This means that this enables use of Swift without Visual Studio for the singular purpose of providing 3 header files. Additionally, it removes the need for the installation of 2 of the 4 support files. This greatly simplifies the deployment process on Windows. --- stdlib/private/RuntimeUnittest/CMakeLists.txt | 2 +- stdlib/private/StdlibCollectionUnittest/CMakeLists.txt | 2 +- stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt | 2 +- stdlib/private/StdlibUnittest/CMakeLists.txt | 2 +- stdlib/private/StdlibUnittest/RaceTest.swift | 2 +- stdlib/private/StdlibUnittest/StdlibCoreExtras.swift | 2 +- stdlib/private/StdlibUnittest/StdlibUnittest.swift | 2 +- stdlib/private/StdlibUnittest/SymbolLookup.swift | 2 +- stdlib/private/SwiftPrivate/CMakeLists.txt | 2 +- stdlib/private/SwiftPrivate/IO.swift | 2 +- stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt | 2 +- stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift | 2 +- .../SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift | 2 +- stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt | 2 +- .../SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift | 2 +- stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift | 2 +- stdlib/private/SwiftReflectionTest/CMakeLists.txt | 2 +- stdlib/public/Concurrency/CMakeLists.txt | 2 +- stdlib/public/Differentiation/CMakeLists.txt | 2 +- stdlib/public/Differentiation/TgmathDerivatives.swift.gyb | 2 +- stdlib/public/Platform/CMakeLists.txt | 4 ++-- stdlib/public/Platform/Platform.swift | 4 ---- stdlib/public/Platform/{msvcrt.swift => ucrt.swift} | 1 - test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb | 2 +- test/AutoDiff/validation-test/custom_derivatives.swift | 2 +- test/AutoDiff/validation-test/separate_tangent_type.swift | 2 +- test/ClangImporter/availability_returns_twice-msvc.swift | 2 +- test/ClangImporter/clang_builtins.swift | 2 +- test/IRGen/builtin_math.swift | 2 +- test/IRGen/sanitize_coverage.swift | 2 +- test/Interpreter/SDK/libc.swift | 2 +- test/Interpreter/dynamicReplacement_property_observer.swift | 2 +- test/Interpreter/dynamic_replacement.swift | 2 +- test/Interpreter/dynamic_replacement_chaining.swift | 2 +- .../dynamic_replacement_without_previous_calls.swift | 2 +- test/Prototypes/BigInt.swift | 2 +- test/Sanitizers/tsan.swift | 2 +- test/stdlib/FloatConstants.swift | 2 +- test/stdlib/MathConstants.swift | 2 +- test/stdlib/PrintFloat.swift.gyb | 2 +- test/stdlib/Runtime.swift.gyb | 2 +- test/stdlib/VarArgs.swift | 2 +- test/stdlib/tgmath.swift.gyb | 2 +- test/stdlib/tgmath_optimized.swift | 2 +- 44 files changed, 43 insertions(+), 48 deletions(-) rename stdlib/public/Platform/{msvcrt.swift => ucrt.swift} (99%) diff --git a/stdlib/private/RuntimeUnittest/CMakeLists.txt b/stdlib/private/RuntimeUnittest/CMakeLists.txt index 3f042f605613a..538ff3c4cf2e5 100644 --- a/stdlib/private/RuntimeUnittest/CMakeLists.txt +++ b/stdlib/private/RuntimeUnittest/CMakeLists.txt @@ -13,7 +13,7 @@ add_swift_target_library(swiftRuntimeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT + SWIFT_MODULE_DEPENDS_WINDOWS CRT SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} INSTALL_IN_COMPONENT stdlib-experimental DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}") diff --git a/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt b/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt index 0efaf5ab37f0b..f0eb6fe467cff 100644 --- a/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt +++ b/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt @@ -24,7 +24,7 @@ add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BU SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT + SWIFT_MODULE_DEPENDS_WINDOWS CRT SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} INSTALL_IN_COMPONENT stdlib-experimental DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}") diff --git a/stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt b/stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt index 20aaa0a81bfa8..979cc9dfccb69 100644 --- a/stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt +++ b/stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt @@ -12,7 +12,7 @@ add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT + SWIFT_MODULE_DEPENDS_WINDOWS CRT SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} INSTALL_IN_COMPONENT stdlib-experimental DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}") diff --git a/stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/private/StdlibUnittest/CMakeLists.txt index d1f61270a89b6..634d34b7198ed 100644 --- a/stdlib/private/StdlibUnittest/CMakeLists.txt +++ b/stdlib/private/StdlibUnittest/CMakeLists.txt @@ -41,7 +41,7 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK + SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} INSTALL_IN_COMPONENT stdlib-experimental DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}") diff --git a/stdlib/private/StdlibUnittest/RaceTest.swift b/stdlib/private/StdlibUnittest/RaceTest.swift index ef25992e8c54d..58b415965b6d8 100644 --- a/stdlib/private/StdlibUnittest/RaceTest.swift +++ b/stdlib/private/StdlibUnittest/RaceTest.swift @@ -44,7 +44,7 @@ import Darwin #elseif canImport(Glibc) import Glibc #elseif os(Windows) -import MSVCRT +import CRT import WinSDK #endif diff --git a/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift b/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift index a734f9fc0e047..b76c1140f6d7b 100644 --- a/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift +++ b/stdlib/private/StdlibUnittest/StdlibCoreExtras.swift @@ -17,7 +17,7 @@ import Darwin #elseif canImport(Glibc) import Glibc #elseif os(Windows) -import MSVCRT +import CRT #endif #if _runtime(_ObjC) diff --git a/stdlib/private/StdlibUnittest/StdlibUnittest.swift b/stdlib/private/StdlibUnittest/StdlibUnittest.swift index f8841795eee92..4a1f89ddec2c1 100644 --- a/stdlib/private/StdlibUnittest/StdlibUnittest.swift +++ b/stdlib/private/StdlibUnittest/StdlibUnittest.swift @@ -21,7 +21,7 @@ import Darwin #elseif canImport(Glibc) import Glibc #elseif os(Windows) -import MSVCRT +import CRT import WinSDK #endif diff --git a/stdlib/private/StdlibUnittest/SymbolLookup.swift b/stdlib/private/StdlibUnittest/SymbolLookup.swift index 2d99cc4f6f3da..5cab6a1ac5c1b 100644 --- a/stdlib/private/StdlibUnittest/SymbolLookup.swift +++ b/stdlib/private/StdlibUnittest/SymbolLookup.swift @@ -15,7 +15,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT import WinSDK #else #error("Unsupported platform") diff --git a/stdlib/private/SwiftPrivate/CMakeLists.txt b/stdlib/private/SwiftPrivate/CMakeLists.txt index e0ab051ba48a2..c68670bce1814 100644 --- a/stdlib/private/SwiftPrivate/CMakeLists.txt +++ b/stdlib/private/SwiftPrivate/CMakeLists.txt @@ -15,7 +15,7 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I GYB_SOURCES AtomicInt.swift.gyb - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK + SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK SWIFT_COMPILE_FLAGS ${swift_swiftprivate_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} INSTALL_IN_COMPONENT stdlib-experimental DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}") diff --git a/stdlib/private/SwiftPrivate/IO.swift b/stdlib/private/SwiftPrivate/IO.swift index 152ae9a0bc1a8..f973261d4c920 100644 --- a/stdlib/private/SwiftPrivate/IO.swift +++ b/stdlib/private/SwiftPrivate/IO.swift @@ -14,7 +14,7 @@ import Swift import SwiftShims #if os(Windows) -import MSVCRT +import CRT import WinSDK #endif diff --git a/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt b/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt index b923d3f1d5e99..887b4bab6f64f 100644 --- a/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt +++ b/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt @@ -18,6 +18,6 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK + SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK INSTALL_IN_COMPONENT stdlib-experimental DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}") diff --git a/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift b/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift index 0b9aeb8466b65..e28c46872ff42 100644 --- a/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift +++ b/stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift @@ -16,7 +16,7 @@ import Darwin #elseif canImport(Glibc) import Glibc #elseif os(Windows) -import MSVCRT +import CRT import WinSDK #endif diff --git a/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift b/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift index d9dd93277e471..b5e76d6be64f8 100644 --- a/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift +++ b/stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift @@ -16,7 +16,7 @@ import Darwin #elseif canImport(Glibc) import Glibc #elseif os(Windows) -import MSVCRT +import CRT #endif public func _stdlib_mkstemps(_ template: inout String, _ suffixlen: CInt) -> CInt { diff --git a/stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt b/stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt index 76487eb500314..0c9fefb71d6b7 100644 --- a/stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt +++ b/stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt @@ -15,7 +15,7 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK + SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} TARGET_SDKS ALL_APPLE_PLATFORMS CYGWIN FREEBSD OPENBSD HAIKU LINUX WINDOWS ANDROID INSTALL_IN_COMPONENT stdlib-experimental diff --git a/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift b/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift index 9b044cbd55457..fa802a44cc49c 100644 --- a/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift +++ b/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift @@ -20,7 +20,7 @@ import Darwin #elseif canImport(Glibc) import Glibc #elseif os(Windows) -import MSVCRT +import CRT import WinSDK #endif diff --git a/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift b/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift index 73b989377c578..4138ddc7bfa84 100644 --- a/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift +++ b/stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift @@ -15,7 +15,7 @@ import Darwin #elseif canImport(Glibc) import Glibc #elseif os(Windows) -import MSVCRT +import CRT import WinSDK #endif diff --git a/stdlib/private/SwiftReflectionTest/CMakeLists.txt b/stdlib/private/SwiftReflectionTest/CMakeLists.txt index 7c33850c96a2c..f07e50f13e2b6 100644 --- a/stdlib/private/SwiftReflectionTest/CMakeLists.txt +++ b/stdlib/private/SwiftReflectionTest/CMakeLists.txt @@ -9,7 +9,7 @@ if (SWIFT_INCLUDE_TESTS) SWIFT_MODULE_DEPENDS_TVOS Darwin SWIFT_MODULE_DEPENDS_WATCHOS Darwin SWIFT_MODULE_DEPENDS_LINUX Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT + SWIFT_MODULE_DEPENDS_WINDOWS CRT INSTALL_IN_COMPONENT stdlib-experimental DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}") diff --git a/stdlib/public/Concurrency/CMakeLists.txt b/stdlib/public/Concurrency/CMakeLists.txt index c7addf55947ec..32541e85a27cd 100644 --- a/stdlib/public/Concurrency/CMakeLists.txt +++ b/stdlib/public/Concurrency/CMakeLists.txt @@ -25,7 +25,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT + SWIFT_MODULE_DEPENDS_WINDOWS CRT LINK_LIBRARIES swiftCore diff --git a/stdlib/public/Differentiation/CMakeLists.txt b/stdlib/public/Differentiation/CMakeLists.txt index ecd1b8637f3fd..48ab091a260c2 100644 --- a/stdlib/public/Differentiation/CMakeLists.txt +++ b/stdlib/public/Differentiation/CMakeLists.txt @@ -32,7 +32,7 @@ add_swift_target_library(swift_Differentiation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPE SWIFT_MODULE_DEPENDS_OPENBSD Glibc SWIFT_MODULE_DEPENDS_CYGWIN Glibc SWIFT_MODULE_DEPENDS_HAIKU Glibc - SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT + SWIFT_MODULE_DEPENDS_WINDOWS CRT SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS} diff --git a/stdlib/public/Differentiation/TgmathDerivatives.swift.gyb b/stdlib/public/Differentiation/TgmathDerivatives.swift.gyb index 1a770907f5a55..d5ef6502aed4c 100644 --- a/stdlib/public/Differentiation/TgmathDerivatives.swift.gyb +++ b/stdlib/public/Differentiation/TgmathDerivatives.swift.gyb @@ -19,7 +19,7 @@ import Swift #elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt index ae972bc2e5cbb..0d7adcd3b3e42 100644 --- a/stdlib/public/Platform/CMakeLists.txt +++ b/stdlib/public/Platform/CMakeLists.txt @@ -48,8 +48,8 @@ add_swift_target_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_O INSTALL_IN_COMPONENT sdk-overlay DEPENDS glibc_modulemap) -add_swift_target_library(swiftMSVCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY - msvcrt.swift +add_swift_target_library(swiftCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY + ucrt.swift ${swift_platform_sources} POSIXError.swift diff --git a/stdlib/public/Platform/Platform.swift b/stdlib/public/Platform/Platform.swift index 5243b516379f9..eebde99006153 100644 --- a/stdlib/public/Platform/Platform.swift +++ b/stdlib/public/Platform/Platform.swift @@ -13,10 +13,6 @@ import SwiftShims import SwiftOverlayShims -#if os(Windows) -import ucrt -#endif - #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) //===----------------------------------------------------------------------===// // MacTypes.h diff --git a/stdlib/public/Platform/msvcrt.swift b/stdlib/public/Platform/ucrt.swift similarity index 99% rename from stdlib/public/Platform/msvcrt.swift rename to stdlib/public/Platform/ucrt.swift index 5030fc35061b7..80181db44d5cf 100644 --- a/stdlib/public/Platform/msvcrt.swift +++ b/stdlib/public/Platform/ucrt.swift @@ -11,7 +11,6 @@ //===----------------------------------------------------------------------===// @_exported import ucrt // Clang module -@_exported import visualc // Clang module @available(swift, deprecated: 3.0, message: "Please use 'Double.pi' or '.pi' to get the value of correct type and avoid casting.") public let M_PI = Double.pi diff --git a/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb b/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb index 6a7573f51e4a4..b0699fdb6721e 100644 --- a/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb +++ b/test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb @@ -6,7 +6,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/AutoDiff/validation-test/custom_derivatives.swift b/test/AutoDiff/validation-test/custom_derivatives.swift index bd3fda6f560a7..bb32e01a66ea6 100644 --- a/test/AutoDiff/validation-test/custom_derivatives.swift +++ b/test/AutoDiff/validation-test/custom_derivatives.swift @@ -7,7 +7,7 @@ import StdlibUnittest #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import ucrt + import CRT #else #error("Unsupported platform") #endif diff --git a/test/AutoDiff/validation-test/separate_tangent_type.swift b/test/AutoDiff/validation-test/separate_tangent_type.swift index a39a3d39c14a6..0d38d0ca753f4 100644 --- a/test/AutoDiff/validation-test/separate_tangent_type.swift +++ b/test/AutoDiff/validation-test/separate_tangent_type.swift @@ -7,7 +7,7 @@ import StdlibUnittest #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import ucrt + import CRT #else #error("Unsupported platform") #endif diff --git a/test/ClangImporter/availability_returns_twice-msvc.swift b/test/ClangImporter/availability_returns_twice-msvc.swift index 36bee9412138b..904ea8de42031 100644 --- a/test/ClangImporter/availability_returns_twice-msvc.swift +++ b/test/ClangImporter/availability_returns_twice-msvc.swift @@ -1,7 +1,7 @@ // RUN: %target-typecheck-verify-swift // REQUIRES: OS=windows-msvc -import MSVCRT +import visualc typealias JumpBuffer = _JBTYPE func test_unavailable_returns_twice_function() { diff --git a/test/ClangImporter/clang_builtins.swift b/test/ClangImporter/clang_builtins.swift index 07557df68b723..50d05084d2403 100644 --- a/test/ClangImporter/clang_builtins.swift +++ b/test/ClangImporter/clang_builtins.swift @@ -5,7 +5,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/IRGen/builtin_math.swift b/test/IRGen/builtin_math.swift index 3602af70075cf..cb8eb439a154e 100644 --- a/test/IRGen/builtin_math.swift +++ b/test/IRGen/builtin_math.swift @@ -5,7 +5,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/IRGen/sanitize_coverage.swift b/test/IRGen/sanitize_coverage.swift index 3114e5a7c7040..b7444d2d1a57d 100644 --- a/test/IRGen/sanitize_coverage.swift +++ b/test/IRGen/sanitize_coverage.swift @@ -14,7 +14,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/Interpreter/SDK/libc.swift b/test/Interpreter/SDK/libc.swift index 9e91f9833befe..c68e1f5be7db2 100644 --- a/test/Interpreter/SDK/libc.swift +++ b/test/Interpreter/SDK/libc.swift @@ -14,7 +14,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT let S_IRUSR: Int32 = ucrt._S_IREAD let S_IWUSR: Int32 = 0 diff --git a/test/Interpreter/dynamicReplacement_property_observer.swift b/test/Interpreter/dynamicReplacement_property_observer.swift index ae1f435c81bcd..613f89b9c7181 100644 --- a/test/Interpreter/dynamicReplacement_property_observer.swift +++ b/test/Interpreter/dynamicReplacement_property_observer.swift @@ -16,7 +16,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT import WinSDK #else #error("Unsupported platform") diff --git a/test/Interpreter/dynamic_replacement.swift b/test/Interpreter/dynamic_replacement.swift index 8518de95e7c80..1e027dcc8fcc7 100644 --- a/test/Interpreter/dynamic_replacement.swift +++ b/test/Interpreter/dynamic_replacement.swift @@ -109,7 +109,7 @@ import StdlibUnittest #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT import WinSDK #else #error("Unsupported platform") diff --git a/test/Interpreter/dynamic_replacement_chaining.swift b/test/Interpreter/dynamic_replacement_chaining.swift index 421ed96996d0d..9a4c251c309e1 100644 --- a/test/Interpreter/dynamic_replacement_chaining.swift +++ b/test/Interpreter/dynamic_replacement_chaining.swift @@ -30,7 +30,7 @@ import StdlibUnittest #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT import WinSDK #else #error("Unsupported platform") diff --git a/test/Interpreter/dynamic_replacement_without_previous_calls.swift b/test/Interpreter/dynamic_replacement_without_previous_calls.swift index bc7301e816f60..dd5dadc617f9d 100644 --- a/test/Interpreter/dynamic_replacement_without_previous_calls.swift +++ b/test/Interpreter/dynamic_replacement_without_previous_calls.swift @@ -16,7 +16,7 @@ import StdlibUnittest #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT import WinSDK #else #error("Unsupported platform") diff --git a/test/Prototypes/BigInt.swift b/test/Prototypes/BigInt.swift index f6c96eaa7a045..2399f9fbef5fd 100644 --- a/test/Prototypes/BigInt.swift +++ b/test/Prototypes/BigInt.swift @@ -27,7 +27,7 @@ import StdlibUnittest #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/Sanitizers/tsan.swift b/test/Sanitizers/tsan.swift index 3fbc8dd5defe1..6b51cf07034a0 100644 --- a/test/Sanitizers/tsan.swift +++ b/test/Sanitizers/tsan.swift @@ -15,7 +15,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/stdlib/FloatConstants.swift b/test/stdlib/FloatConstants.swift index 24e3fea8dc6d0..3a3d4e98235f7 100644 --- a/test/stdlib/FloatConstants.swift +++ b/test/stdlib/FloatConstants.swift @@ -5,7 +5,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/stdlib/MathConstants.swift b/test/stdlib/MathConstants.swift index 61fb01b584645..3fdb5a7dcbc61 100644 --- a/test/stdlib/MathConstants.swift +++ b/test/stdlib/MathConstants.swift @@ -5,7 +5,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/stdlib/PrintFloat.swift.gyb b/test/stdlib/PrintFloat.swift.gyb index 2795a1c8a3473..ec24b7ba11113 100644 --- a/test/stdlib/PrintFloat.swift.gyb +++ b/test/stdlib/PrintFloat.swift.gyb @@ -15,7 +15,7 @@ import StdlibUnittest #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/stdlib/Runtime.swift.gyb b/test/stdlib/Runtime.swift.gyb index ae05de0b0b8c6..ca9e81d3e6a41 100644 --- a/test/stdlib/Runtime.swift.gyb +++ b/test/stdlib/Runtime.swift.gyb @@ -15,7 +15,7 @@ import SwiftShims #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT import WinSDK #else #error("Unsupported platform") diff --git a/test/stdlib/VarArgs.swift b/test/stdlib/VarArgs.swift index 90dff40f81e3a..feda99a9d95b5 100644 --- a/test/stdlib/VarArgs.swift +++ b/test/stdlib/VarArgs.swift @@ -10,7 +10,7 @@ import Swift import Glibc typealias CGFloat = Double #elseif os(Windows) - import MSVCRT + import CRT #if arch(x86_64) || arch(arm64) typealias CGFloat = Double #else diff --git a/test/stdlib/tgmath.swift.gyb b/test/stdlib/tgmath.swift.gyb index 3a1e526ab30f0..f4ad32701e42e 100644 --- a/test/stdlib/tgmath.swift.gyb +++ b/test/stdlib/tgmath.swift.gyb @@ -22,7 +22,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif diff --git a/test/stdlib/tgmath_optimized.swift b/test/stdlib/tgmath_optimized.swift index b1628b922e707..209e68277e915 100644 --- a/test/stdlib/tgmath_optimized.swift +++ b/test/stdlib/tgmath_optimized.swift @@ -9,7 +9,7 @@ #elseif canImport(Glibc) import Glibc #elseif os(Windows) - import MSVCRT + import CRT #else #error("Unsupported platform") #endif