Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-24 08:35:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

project.cc: deduplicate more cases

Browse Source
This commit is contained in:
Fangrui Song 2018-11-02 15:17:46 -07:00
parent 334557e9fe
commit 42b6b7b3f0
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/project.cc
View File

@ -87,7 +87,11 @@ enum OptionClass {
struct ProjectProcessor { struct ProjectProcessor {
ProjectConfig *config; ProjectConfig *config;
std::unordered_set<size_t> command_set; std::unordered_set<size_t> command_set;
ProjectProcessor(ProjectConfig *config) : config(config) {} StringSet<> excludeArgs;
ProjectProcessor(ProjectConfig *config) : config(config) {
for (auto &arg : g_config->clang.excludeArgs)
excludeArgs.insert(arg);
}
void Process(Project::Entry &entry) { void Process(Project::Entry &entry) {
const std::string base_name = sys::path::filename(entry.filename); const std::string base_name = sys::path::filename(entry.filename);
@ -105,7 +109,7 @@ struct ProjectProcessor {
args.push_back(arg + 5); args.push_back(arg + 5);
} else if (strcmp(arg, "%clang") == 0) { } else if (strcmp(arg, "%clang") == 0) {
args.push_back(lang == LanguageId::Cpp ? "clang++" : "clang"); args.push_back(lang == LanguageId::Cpp ? "clang++" : "clang");
} else if (!llvm::is_contained(g_config->clang.excludeArgs, arg)) { } else if (!excludeArgs.count(arg)) {
args.push_back(arg); args.push_back(arg);
} }
} }
@ -115,22 +119,30 @@ struct ProjectProcessor {
args.push_back(Intern(arg)); args.push_back(Intern(arg));
size_t hash = std::hash<std::string>{}(entry.directory); size_t hash = std::hash<std::string>{}(entry.directory);
bool OPT_o = false;
for (auto &arg : args) { for (auto &arg : args) {
if (arg[0] != '-' && EndsWith(arg, base_name)) { bool last_o = OPT_o;
OPT_o = false;
if (arg[0] == '-') {
OPT_o = arg[1] == 'o' && arg[2] == '\0';
if (OPT_o || arg[1] == 'D' || arg[1] == 'W')
continue;
} else if (last_o) {
continue;
} else if (sys::path::filename(arg) == base_name) {
LanguageId lang = lookupExtension(arg).first; LanguageId lang = lookupExtension(arg).first;
if (lang != LanguageId::Unknown) { if (lang != LanguageId::Unknown) {
hash_combine(hash, size_t(lang)); hash_combine(hash, (size_t)lang);
continue; continue;
} }
} }
hash_combine(hash, std::hash<std::string>{}(arg)); hash_combine(hash, std::hash<std::string_view>{}(arg));
} }
args.push_back(Intern("-working-directory=" + entry.directory)); args.push_back(Intern("-working-directory=" + entry.directory));
entry.args = args;
if (!command_set.insert(hash).second) { args.push_back("-fsyntax-only");
entry.args = std::move(args); if (!command_set.insert(hash).second)
return; return;
}
// a weird C++ deduction guide heap-use-after-free causes libclang to crash. // a weird C++ deduction guide heap-use-after-free causes libclang to crash.
IgnoringDiagConsumer DiagC; IgnoringDiagConsumer DiagC;
@ -149,8 +161,6 @@ struct ProjectProcessor {
} }
Driver.setCheckInputsExist(false); Driver.setCheckInputsExist(false);
args.push_back("-fsyntax-only");
std::unique_ptr<driver::Compilation> C(Driver.BuildCompilation(args)); std::unique_ptr<driver::Compilation> C(Driver.BuildCompilation(args));
const driver::JobList &Jobs = C->getJobs(); const driver::JobList &Jobs = C->getJobs();
if (Jobs.size() != 1) if (Jobs.size() != 1)
@ -180,7 +190,6 @@ struct ProjectProcessor {
break; break;
} }
} }
entry.args = std::move(args);
} }
}; };