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

Merge pull request #75146 from artemcm/DepScanNoGlobalLLVMOpts

Browse Source 
[Dependency Scanning] Avoid configuration (and reset) of LLVM Options by the scanner
This commit is contained in:
Artem Chikin
2024-07-11 09:45:13 -07:00
committed by GitHub
parent 156b0a9b47 6d0f52152a
commit 0d254174c6
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Frontend/Frontend.cpp
View File

@@ -691,15 +691,21 @@ bool CompilerInstance::setUpVirtualFileSystemOverlays() {
}
void CompilerInstance::setUpLLVMArguments() {
// Honor -Xllvm.
if (!Invocation.getFrontendOptions().LLVMArgs.empty()) {
llvm::SmallVector<const char *, 4> Args;
Args.push_back("swift (LLVM option parsing)");
for (unsigned i = 0, e = Invocation.getFrontendOptions().LLVMArgs.size();
i != e; ++i)
Args.push_back(Invocation.getFrontendOptions().LLVMArgs[i].c_str());
Args.push_back(nullptr);
llvm::cl::ParseCommandLineOptions(Args.size()-1, Args.data());
// Dependency scanning has no need for LLVM options, and
// must not use `llvm::cl::` utilities operating on global state
// since dependency scanning is multi-threaded.
if (Invocation.getFrontendOptions().RequestedAction !=
FrontendOptions::ActionType::ScanDependencies) {
// Honor -Xllvm.
if (!Invocation.getFrontendOptions().LLVMArgs.empty()) {
llvm::SmallVector<const char *, 4> Args;
Args.push_back("swift (LLVM option parsing)");
for (unsigned i = 0, e = Invocation.getFrontendOptions().LLVMArgs.size();
i != e; ++i)
Args.push_back(Invocation.getFrontendOptions().LLVMArgs[i].c_str());
Args.push_back(nullptr);
llvm::cl::ParseCommandLineOptions(Args.size()-1, Args.data());
}
}
}