maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reinstate r173952, this time limiting it to exactly the form 

#define X X

for which there is no point warning, ever.

llvm-svn: 173991
This commit is contained in:
Douglas Gregor 2013-01-30 23:10:17 +00:00
parent d219675c2a
commit 1a347f76c2
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -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 || MI->isFunctionLike())
Diag(Identifier, diag::pp_disabled_macro_expansion);
}
}

5
clang/test/Headers/stdbool.cpp
View File

@ -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;

6
clang/test/Preprocessor/warn-disabled-macro-expansion.c
View File

@ -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 macro}}
c(c) // expected-warning {{recursive macro}}
y(5) // expected-warning {{recursive macro}}
z(z) // ok