diff options
| -rw-r--r-- | lib/Lex/Preprocessor.cpp | 7 | ||||
| -rw-r--r-- | test/Preprocessor/warn-disabled-macro-expansion.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 4f0b189c8b..df2c98dd8e 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -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); } } } diff --git a/test/Preprocessor/warn-disabled-macro-expansion.c b/test/Preprocessor/warn-disabled-macro-expansion.c index fe8e90c721..b01b63f6b3 100644 --- a/test/Preprocessor/warn-disabled-macro-expansion.c +++ b/test/Preprocessor/warn-disabled-macro-expansion.c @@ -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 |