diff options
| -rw-r--r-- | lib/Lex/Preprocessor.cpp | 13 | ||||
| -rw-r--r-- | test/Preprocessor/extension-warning.c | 10 |
2 files changed, 20 insertions, 3 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 18b106ad84..50fafdc73b 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -476,6 +476,14 @@ static void InitializePredefinedMacros(Preprocessor &PP, DefineBuiltinMacro(Buf, "__int64=long long"); DefineBuiltinMacro(Buf, "__declspec(X)="); } + // Directly modeled after the attribute-based implementation in GCC. + if (PP.getLangOptions().Blocks) + DefineBuiltinMacro(Buf, "__block=__attribute__((__blocks__(byref)))"); + else + // This allows "__block int unusedVar;" even when blocks are disabled. + // This is modeled after GCC's handling of __strong/__weak. + DefineBuiltinMacro(Buf, "__block="); + // FIXME: Should emit a #line directive here. } @@ -594,8 +602,7 @@ void Preprocessor::HandleIdentifier(Token &Identifier) { Identifier.setKind(II.getTokenID()); // If this is an extension token, diagnose its use. - // FIXME: tried (unsuccesfully) to shut this up when compiling with gnu99 - // For now, I'm just commenting it out (while I work on attributes). - if (II.isExtensionToken() && Features.C99) + // We avoid diagnosing tokens that originate from macro definitions. + if (II.isExtensionToken() && Features.C99 && !DisableMacroExpansion) Diag(Identifier, diag::ext_token_used); } diff --git a/test/Preprocessor/extension-warning.c b/test/Preprocessor/extension-warning.c new file mode 100644 index 0000000000..c325c2fcf2 --- /dev/null +++ b/test/Preprocessor/extension-warning.c @@ -0,0 +1,10 @@ +// RUN: clang -fsyntax-only -verify -pedantic %s + +// The preprocessor shouldn't warn about extensions within macro bodies that +// aren't expanded. +#define __block __attribute__((__blocks__(byref))) + +// This warning is entirely valid. +__block int x; // expected-warning{{extension used}} + +void whatever() {} |