r173991 - Reinstate r173952, this time limiting it to exactly the form

[Douglas Gregor]

Author: dgregor
Date: Wed Jan 30 17:10:17 2013
New Revision: 173991

URL: http://llvm.org/viewvc/llvm-project?rev=173991&view=rev
Log:
Reinstate r173952, this time limiting it to exactly the form

  #define X X

for which there is no point warning, ever.

Modified:
    cfe/trunk/lib/Lex/PPMacroExpansion.cpp
    cfe/trunk/test/Headers/stdbool.cpp
    cfe/trunk/test/Preprocessor/warn-disabled-macro-expansion.c

Modified: cfe/trunk/lib/Lex/PPMacroExpansion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=173991&r1=173990&r2=173991&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Wed Jan 30 17:10:17 2013
@@ -459,7 +459,10 @@ bool Preprocessor::HandleMacroExpandedId
       if (MacroInfo *NewMI = getMacroInfo(NewII))
         if (!NewMI->isEnabled() || NewMI == MI) {
           Identifier.setFlag(Token::DisableExpand);
-          Diag(Identifier, diag::pp_disabled_macro_expansion);
+          // Don't warn for "#define X X" like "#define bool bool" from
+          // stdbool.h.
+          if (NewMI != MI || MI->isFunctionLike())
+            Diag(Identifier, diag::pp_disabled_macro_expansion);
         }
     }
 

Modified: cfe/trunk/test/Headers/stdbool.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/stdbool.cpp?rev=173991&r1=173990&r2=173991&view=diff
==============================================================================
--- cfe/trunk/test/Headers/stdbool.cpp (original)
+++ cfe/trunk/test/Headers/stdbool.cpp Wed Jan 30 17:10:17 2013
@@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT %s
 // RUN: %clang_cc1 -std=c++98 -E -dM %s | FileCheck --check-prefix=CHECK-CONFORMING %s
+// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -verify -Weverything %s
 #include <stdbool.h>
 #define zzz
 
@@ -12,3 +13,7 @@
 // CHECK-CONFORMING: #define __CHAR_BIT__
 // CHECK-CONFORMING-NOT: #define false false
 // CHECK-CONFORMING: #define zzz
+
+zzz
+// expected-no-diagnostics
+extern bool x;

Modified: cfe/trunk/test/Preprocessor/warn-disabled-macro-expansion.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/warn-disabled-macro-expansion.c?rev=173991&r1=173990&r2=173991&view=diff
==============================================================================
--- cfe/trunk/test/Preprocessor/warn-disabled-macro-expansion.c (original)
+++ cfe/trunk/test/Preprocessor/warn-disabled-macro-expansion.c Wed Jan 30 17:10:17 2013
@@ -14,9 +14,10 @@
 
 #define c(x) x(0)
 
+#define y(x) y
 #define z(x) (z)(x)
 
-p // expected-warning {{recursive macro}}
+p // no warning
 
 a // expected-warning {{recursive macro}}
 
@@ -28,4 +29,7 @@ h(0) // expected-warning {{recursive mac
 
 c(c) // expected-warning {{recursive macro}}
 
+y(5) // expected-warning {{recursive macro}}
+
 z(z) // ok
+