[clang-tidy] Fix misc-macro-repeated-side-effects false positive with stringified...

llvm-svn: 267254

diff --git a/clang-tools-extra/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp b/clang-tools-extra/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp
index e8ad7c5..699966a 100644 (file)
--- a/clang-tools-extra/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp
@@ -86,6 +86,7 @@ unsigned MacroRepeatedPPCallbacks::countArgumentExpansions(
   int SkipParenCount = 0;
   // Has a __builtin_constant_p been found?
   bool FoundBuiltin = false;
+  bool PrevTokenIsHash = false;
   // Count when "?" is reached. The "Current" will get this value when the ":"
   // is reached.
   std::stack<unsigned, SmallVector<unsigned, 8>> CountAtQuestion;
@@ -98,6 +99,16 @@ unsigned MacroRepeatedPPCallbacks::countArgumentExpansions(
     if (FoundBuiltin && T.isOneOf(tok::question, tok::ampamp, tok::pipepipe))
       return Max;
 
+    // Skip stringified tokens.
+    if (T.is(tok::hash)) {
+      PrevTokenIsHash = true;
+      continue;
+    }
+    if (PrevTokenIsHash) {
+      PrevTokenIsHash = false;
+      continue;
+    }
+
     // Handling of ? and :.
     if (T.is(tok::question)) {
       CountAtQuestion.push(Current);

diff --git a/clang-tools-extra/test/clang-tidy/misc-repeated-side-effects-in-macro.c b/clang-tools-extra/test/clang-tidy/misc-macro-repeated-side-effects.c
similarity index 97%
rename from clang-tools-extra/test/clang-tidy/misc-repeated-side-effects-in-macro.c
rename to clang-tools-extra/test/clang-tidy/misc-macro-repeated-side-effects.c
index a23dd0c..7b01cc6 100644 (file)
--- a/clang-tools-extra/test/clang-tidy/misc-repeated-side-effects-in-macro.c
+++ b/clang-tools-extra/test/clang-tidy/misc-macro-repeated-side-effects.c
@@ -99,3 +99,8 @@ void conditionals(int a, int b)
   condB(a, b++);
 }
 
+void log(const char *s, int v);
+#define LOG(val) log(#val, (val))
+void test_log(int a) {
+  LOG(a++);
+}