diff options
author | Roman Lebedev <lebedev.ri@gmail.com> | 2018-05-08 23:15:58 +0000 |
---|---|---|
committer | Roman Lebedev <lebedev.ri@gmail.com> | 2018-05-08 23:15:58 +0000 |
commit | 6e76a1b1ff98b27b82689b6294cde1d355be088f (patch) | |
tree | c903eb0c18dbeff2955f6d926c45e53c1a087908 /clang-tools-extra/clang-tidy | |
parent | 8e173e11891dd4c29695ca70e91545df15b410f7 (diff) | |
download | bcm5719-llvm-6e76a1b1ff98b27b82689b6294cde1d355be088f.tar.gz bcm5719-llvm-6e76a1b1ff98b27b82689b6294cde1d355be088f.zip |
Partially revert r331456: [clang-tidy] Remove AnalyzeTemporaryDtors option.
That broke every single .clang-tidy config out there
which happened to specify AnalyzeTemporaryDtors option:
YAML:5:24: error: unknown key 'AnalyzeTemporaryDtors'
AnalyzeTemporaryDtors: false
^~~~~
Error parsing <...>/.clang-tidy: Invalid argument
More so, that error isn't actually a error, the
clang-tidy does not exit with $? != 0, it continues
with the default config.
Surely this breakage isn't the intended behavior.
But if it is, feel free to revert this commit.
llvm-svn: 331822
Diffstat (limited to 'clang-tools-extra/clang-tidy')
-rw-r--r-- | clang-tools-extra/clang-tidy/ClangTidyOptions.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp index 082b7c29700..75e3b378622 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp @@ -83,9 +83,11 @@ template <> struct MappingTraits<ClangTidyOptions> { static void mapping(IO &IO, ClangTidyOptions &Options) { MappingNormalization<NOptionMap, ClangTidyOptions::OptionMap> NOpts( IO, Options.CheckOptions); + bool Ignored = false; IO.mapOptional("Checks", Options.Checks); IO.mapOptional("WarningsAsErrors", Options.WarningsAsErrors); IO.mapOptional("HeaderFilterRegex", Options.HeaderFilterRegex); + IO.mapOptional("AnalyzeTemporaryDtors", Ignored); // legacy compatibility IO.mapOptional("FormatStyle", Options.FormatStyle); IO.mapOptional("User", Options.User); IO.mapOptional("CheckOptions", NOpts->Options); |