Revert "[preprocessor] Don't warn about "disabled expansion of recursive macro""
This reverts commit r173952
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173970 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 939c4fa..6379144 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -459,10 +459,7 @@
if (MacroInfo *NewMI = getMacroInfo(NewII))
if (!NewMI->isEnabled() || NewMI == MI) {
Identifier.setFlag(Token::DisableExpand);
- // Don't warn for "#define X X" like "#define bool bool" from
- // stdbool.h.
- if (NewMI != MI)
- Diag(Identifier, diag::pp_disabled_macro_expansion);
+ Diag(Identifier, diag::pp_disabled_macro_expansion);
}
}
diff --git a/test/Headers/stdbool.cpp b/test/Headers/stdbool.cpp
index 7c927db..a252cca 100644
--- a/test/Headers/stdbool.cpp
+++ b/test/Headers/stdbool.cpp
@@ -1,6 +1,5 @@
// 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
@@ -13,7 +12,3 @@
// 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/test/Preprocessor/warn-disabled-macro-expansion.c b/test/Preprocessor/warn-disabled-macro-expansion.c
index c97a4ee..b01b63f 100644
--- a/test/Preprocessor/warn-disabled-macro-expansion.c
+++ b/test/Preprocessor/warn-disabled-macro-expansion.c
@@ -16,7 +16,7 @@
#define z(x) (z)(x)
-p // no warning
+p // expected-warning {{recursive macro}}
a // expected-warning {{recursive macro}}
