зеркало из https://github.com/microsoft/clang-1.git
Don't warn about disabled macro expansion if we see the name of a function-like macro which isn't immediately followed by '('. FreeBSD's stdio.h #defines foo(x) to (foo)(x), apparently.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169960 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Родитель
b94b62c3b1
Коммит
1fbf6fb5c7
|
@ -592,9 +592,7 @@ void Preprocessor::HandleIdentifier(Token &Identifier) {
|
|||
// If this is a macro to be expanded, do it.
|
||||
if (MacroInfo *MI = getMacroInfo(&II)) {
|
||||
if (!DisableMacroExpansion) {
|
||||
if (Identifier.isExpandDisabled()) {
|
||||
Diag(Identifier, diag::pp_disabled_macro_expansion);
|
||||
} else if (MI->isEnabled()) {
|
||||
if (!Identifier.isExpandDisabled() && MI->isEnabled()) {
|
||||
if (!HandleMacroExpandedIdentifier(Identifier, MI))
|
||||
return;
|
||||
} else {
|
||||
|
@ -602,7 +600,8 @@ void Preprocessor::HandleIdentifier(Token &Identifier) {
|
|||
// expanded, even if it's in a context where it could be expanded in the
|
||||
// future.
|
||||
Identifier.setFlag(Token::DisableExpand);
|
||||
Diag(Identifier, diag::pp_disabled_macro_expansion);
|
||||
if (MI->isObjectLike() || isNextPPTokenLParen())
|
||||
Diag(Identifier, diag::pp_disabled_macro_expansion);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
#define c(x) x(0)
|
||||
|
||||
#define z(x) (z)(x)
|
||||
|
||||
p // expected-warning {{recursive macro}}
|
||||
|
||||
a // expected-warning {{recursive macro}}
|
||||
|
@ -25,3 +27,5 @@ g(3) // expected-warning {{recursive macro}}
|
|||
h(0) // expected-warning {{recursive macro}}
|
||||
|
||||
c(c) // expected-warning {{recursive macro}}
|
||||
|
||||
z(z) // ok
|
||||
|
|
Загрузка…
Ссылка в новой задаче