This revision was automatically updated to reflect the committed changes.
Closed by commit rG44119626dedf: [clang-tidy] RenamerClangTidyChecks ignore
builtin and command line macros (authored by njames93).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D80631/new/
https://reviews.llvm.org/D80631
Files:
clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
Index:
clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
@@ -80,7 +80,7 @@
// RUN: {key: readability-identifier-naming.LocalPointerPrefix, value:
'l_'}, \
// RUN: {key: readability-identifier-naming.LocalConstantPointerCase,
value: CamelCase}, \
// RUN: {key: readability-identifier-naming.LocalConstantPointerPrefix,
value: 'lc_'}, \
-// RUN: ]}' -- -fno-delayed-template-parsing \
+// RUN: ]}' -- -fno-delayed-template-parsing -Dbad_macro \
// RUN: -I%S/Inputs/readability-identifier-naming \
// RUN: -isystem %S/Inputs/readability-identifier-naming/system
Index: clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
+++ clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
@@ -73,6 +73,14 @@
/// MacroDefined calls checkMacro for macros in the main file
void MacroDefined(const Token &MacroNameTok,
const MacroDirective *MD) override {
+ if (MD->getMacroInfo()->isBuiltinMacro())
+ return;
+ if (PP->getSourceManager().isWrittenInBuiltinFile(
+ MacroNameTok.getLocation()))
+ return;
+ if (PP->getSourceManager().isWrittenInCommandLineFile(
+ MacroNameTok.getLocation()))
+ return;
Check->checkMacro(PP->getSourceManager(), MacroNameTok,
MD->getMacroInfo());
}
Index: clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/readability-identifier-naming.cpp
@@ -80,7 +80,7 @@
// RUN: {key: readability-identifier-naming.LocalPointerPrefix, value: 'l_'}, \
// RUN: {key: readability-identifier-naming.LocalConstantPointerCase, value: CamelCase}, \
// RUN: {key: readability-identifier-naming.LocalConstantPointerPrefix, value: 'lc_'}, \
-// RUN: ]}' -- -fno-delayed-template-parsing \
+// RUN: ]}' -- -fno-delayed-template-parsing -Dbad_macro \
// RUN: -I%S/Inputs/readability-identifier-naming \
// RUN: -isystem %S/Inputs/readability-identifier-naming/system
Index: clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
+++ clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp
@@ -73,6 +73,14 @@
/// MacroDefined calls checkMacro for macros in the main file
void MacroDefined(const Token &MacroNameTok,
const MacroDirective *MD) override {
+ if (MD->getMacroInfo()->isBuiltinMacro())
+ return;
+ if (PP->getSourceManager().isWrittenInBuiltinFile(
+ MacroNameTok.getLocation()))
+ return;
+ if (PP->getSourceManager().isWrittenInCommandLineFile(
+ MacroNameTok.getLocation()))
+ return;
Check->checkMacro(PP->getSourceManager(), MacroNameTok, MD->getMacroInfo());
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
