diff options
-rw-r--r-- | clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp | 3 | ||||
-rw-r--r-- | clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp index 01c25d241a5..ac5ec130f46 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/MacroUsageCheck.cpp @@ -36,7 +36,8 @@ public: IgnoreCommandLineMacros(IgnoreCommandLine) {} void MacroDefined(const Token &MacroNameTok, const MacroDirective *MD) override { - if (MD->getMacroInfo()->isUsedForHeaderGuard() || + if (SM.isWrittenInBuiltinFile(MD->getLocation()) || + MD->getMacroInfo()->isUsedForHeaderGuard() || MD->getMacroInfo()->getNumTokens() == 0) return; diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp index a4948f5b329..edce328ec65 100644 --- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp +++ b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-macro-usage.cpp @@ -1,4 +1,4 @@ -// RUN: %check_clang_tidy %s cppcoreguidelines-macro-usage %t +// RUN: %check_clang_tidy %s cppcoreguidelines-macro-usage %t -- -header-filter=.* -system-headers -- #ifndef INCLUDE_GUARD #define INCLUDE_GUARD |