intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 12:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent premature macro expansion in __has_builtin, __has_feature,

Browse Source 
__has_attribute, __has_extension, making them behave more akin to
conventional macros.

llvm-svn: 168268
This commit is contained in:
Andy Gibbs
2012-11-17 19:18:27 +00:00
parent a8df57a962
commit d41d094244
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1228,15 +1228,15 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
IdentifierInfo *FeatureII = 0;
// Read the '('.
Lex(Tok);
LexUnexpandedToken(Tok);
if (Tok.is(tok::l_paren)) {
// Read the identifier
Lex(Tok);
LexUnexpandedToken(Tok);
if (Tok.is(tok::identifier) || Tok.is(tok::kw_const)) {
FeatureII = Tok.getIdentifierInfo();
// Read the ')'.
Lex(Tok);
LexUnexpandedToken(Tok);
if (Tok.is(tok::r_paren))
IsValid = true;
}

20
clang/test/Preprocessor/feature_tests.c
View File

@@ -32,3 +32,23 @@
__has_builtin(__builtin_altivec_abs_v4sf)
#error Broken handling of target-specific builtins
#endif
// Macro expansion does not occur in the parameter to __has_builtin,
// __has_feature, etc. (as is also expected behaviour for ordinary
// macros), so the following should not expand:
#define MY_ALIAS_BUILTIN __c11_atomic_init
#define MY_ALIAS_FEATURE attribute_overloadable
#if __has_builtin(MY_ALIAS_BUILTIN) || __has_feature(MY_ALIAS_FEATURE)
#error Alias expansion not allowed
#endif
// But deferring should expand:
#define HAS_BUILTIN(X) __has_builtin(X)
#define HAS_FEATURE(X) __has_feature(X)
#if !HAS_BUILTIN(MY_ALIAS_BUILTIN) || !HAS_FEATURE(MY_ALIAS_FEATURE)
#error Expansion should have occurred
#endif