averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79278 from compnerd/modular

Browse Source
This commit is contained in:
Saleem Abdulrasool
2025-02-11 05:48:29 -08:00
committed by GitHub
parent 134eb51ea5 79d2af759b
commit a86743e77e
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/ClangImporter/ClangIncludePaths.cpp
View File

@@ -560,16 +560,27 @@ void GetWindowsFileMappings(
fileMapping.redirectedFiles.emplace_back(std::string(VCToolsInjection),
AuxiliaryFile);
// __msvc_bit_utils.hpp was added in a recent VS 2022 version. It has to be
// referenced from the modulemap directly to avoid modularization errors.
// Older VS versions might not have it. Let's inject an empty header file if
// it isn't available.
// Because we wish to be backwrds compatible with older Visual Studio
// releases, we inject empty headers which allow us to have definitions for
// modules referencing headers which may not exist. We stub out the headers
// with empty files to allow a single module definition to work across
// different MSVC STL releases.
//
// __msvc_bit_utils.hpp was introduced in VS 2022 STL release 17.8.
// __msvc_string_view.hpp was introduced in VS 2022 STL release 17.11.
static const char * const kInjectedHeaders[] = {
"__msvc_bit_utils.hpp",
"__msvc_string_view.hpp",
};
for (const char * const header : kInjectedHeaders) {
llvm::sys::path::remove_filename(VCToolsInjection);
llvm::sys::path::append(VCToolsInjection, "__msvc_bit_utils.hpp");
llvm::sys::path::append(VCToolsInjection, header);
if (!llvm::sys::fs::exists(VCToolsInjection))
fileMapping.overridenFiles.emplace_back(std::string(VCToolsInjection),
fileMapping.overridenFiles.emplace_back(std::string{VCToolsInjection},
"");
}
}
}
} // namespace

5
stdlib/public/Platform/vcruntime.modulemap
View File

@@ -707,6 +707,11 @@ module std [system] {
export *
}
explicit module __msvc_string_view {
header "__msvc_string_view.hpp"
export *
}
explicit module xatomic {
header "xatomic.h"
export *