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

[scanner] Adopt new Clang API for build arguments (#68503)

Browse Source
This commit is contained in:
Jan Svoboda
2023-10-06 20:31:05 +02:00
committed by GitHub
parent a7e26b7279
commit 8b6e58ac15
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ClangImporter/ClangModuleDependencyScanner.cpp
View File

@@ -128,7 +128,7 @@ static std::vector<std::string> getClangDepScanningInvocationArguments(
}
ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
const clang::tooling::dependencies::ModuleDepsGraph &clangDependencies,
clang::tooling::dependencies::ModuleDepsGraph &clangDependencies,
StringRef moduleOutputPath, RemapPathCallback callback) {
const auto &ctx = Impl.SwiftContext;
ModuleDependencyVector result;
@@ -146,7 +146,7 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
("-fapinotes-swift-version=" +
ctx.LangOpts.EffectiveLanguageVersion.asAPINotesVersionString())};
for (const auto &clangModuleDep : clangDependencies) {
for (auto &clangModuleDep : clangDependencies) {
// File dependencies for this module.
std::vector<std::string> fileDeps;
for (const auto &fileDep : clangModuleDep.FileDeps) {
@@ -201,9 +201,9 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
new clang::IgnoringDiagConsumer());
llvm::SmallVector<const char*> clangArgs;
llvm::for_each(clangModuleDep.BuildArguments, [&](const std::string &Arg) {
clangArgs.push_back(Arg.c_str());
});
llvm::for_each(
clangModuleDep.getBuildArguments(),
[&](const std::string &Arg) { clangArgs.push_back(Arg.c_str()); });
bool success = clang::CompilerInvocation::CreateFromArgs(
depsInvocation, clangArgs, clangDiags);