This is an archive of the discontinued LLVM Phabricator instance.

Differential D84850

[clang-tidy] Fix module options being registered with different priorities
ClosedPublic

Authored by njames93 on Jul 29 2020, 8:01 AM.

Details

Reviewers
DmitryPolukhin
Commits
rG62beb7c6f4f2: [clang-tidy] Fix module options being registered with different priorities
Summary

Not a bug that is ever likely to materialise, but still worth fixing

Diff Detail

Event Timeline

njames93 created this revision.Jul 29 2020, 8:01 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 29 2020, 8:01 AM
Herald added subscribers: cfe-commits, xazax.hun. · View Herald Transcript
njames93 requested review of this revision.Jul 29 2020, 8:01 AM
DmitryPolukhin accepted this revision.Jul 29 2020, 8:09 AM

Thank you for identifying and fixing!

This revision is now accepted and ready to land.Jul 29 2020, 8:09 AM
This revision was landed with ongoing or failed builds.Jul 29 2020, 8:19 AM
Closed by commit rG62beb7c6f4f2: [clang-tidy] Fix module options being registered with different priorities (authored by njames93). · Explain Why
This revision was automatically updated to reflect the committed changes.
njames93 added a commit: rG62beb7c6f4f2: [clang-tidy] Fix module options being registered with different priorities.
Harbormaster completed remote builds in B66212: Diff 281595.Jul 29 2020, 8:53 AM

Revision Contents

PathSize
clang-tools-extra/
clang-tidy/
4 lines

Diff 281603

clang-tools-extra/clang-tidy/ClangTidyOptions.cpp

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Lines
ClangTidyOptions ClangTidyOptions::getDefaults() { ClangTidyOptions ClangTidyOptions::getDefaults() {
ClangTidyOptions Options; ClangTidyOptions Options;
Options.Checks = ""; Options.Checks = "";
Options.WarningsAsErrors = ""; Options.WarningsAsErrors = "";
Options.HeaderFilterRegex = ""; Options.HeaderFilterRegex = "";
Options.SystemHeaders = false; Options.SystemHeaders = false;
Options.FormatStyle = "none"; Options.FormatStyle = "none";
Options.User = llvm::None; Options.User = llvm::None;
unsigned Priority = 0;
for (const ClangTidyModuleRegistry::entry &Module : for (const ClangTidyModuleRegistry::entry &Module :
ClangTidyModuleRegistry::entries()) ClangTidyModuleRegistry::entries())
Options = Options = Options.mergeWith(Module.instantiate()->getModuleOptions(), 0);
Options.mergeWith(Module.instantiate()->getModuleOptions(), ++Priority);
return Options; return Options;
} }
template <typename T> template <typename T>
static void mergeVectors(Optional<T> &Dest, const Optional<T> &Src) { static void mergeVectors(Optional<T> &Dest, const Optional<T> &Src) {
if (Src) { if (Src) {
if (Dest) if (Dest)
Dest->insert(Dest->end(), Src->begin(), Src->end()); Dest->insert(Dest->end(), Src->begin(), Src->end());
▲ Show 20 Lines • Show All 271 Lines • Show Last 20 Lines