diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/PPMacroExpansion.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Headers/stdbool.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Preprocessor/warn-disabled-macro-expansion.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index 63791448858..939c4faf7a0 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -459,7 +459,10 @@ bool Preprocessor::HandleMacroExpandedIdentifier(Token &Identifier, 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) + Diag(Identifier, diag::pp_disabled_macro_expansion); } } diff --git a/clang/test/Headers/stdbool.cpp b/clang/test/Headers/stdbool.cpp index a252cca1a6a..7c927db441b 100644 --- a/clang/test/Headers/stdbool.cpp +++ b/clang/test/Headers/stdbool.cpp @@ -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; diff --git a/clang/test/Preprocessor/warn-disabled-macro-expansion.c b/clang/test/Preprocessor/warn-disabled-macro-expansion.c index b01b63f6b3f..c97a4ee4431 100644 --- a/clang/test/Preprocessor/warn-disabled-macro-expansion.c +++ b/clang/test/Preprocessor/warn-disabled-macro-expansion.c @@ -16,7 +16,7 @@ #define z(x) (z)(x) -p // expected-warning {{recursive macro}} +p // no warning a // expected-warning {{recursive macro}} |
