mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 02:24:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

cpplib.h (cpp_callbacks): Add has_attribute.

Browse Source 
libcpp:

2014-11-10  Edward Smith-Rowland  <3dw4rd@verizon.net>

	* include/cpplib.h (cpp_callbacks): Add has_attribute.
	* internal.h (lexer_state): Add in__has_attribute__.
	* directives.c (lex_macro_node): Prevent use of __has_attribute__
	as a macro.
	* expr.c (parse_has_attribute): New function; (eval_token): Look for
	__has_attribute__ and route to parse_has_attribute.
	* identifiers.c (_cpp_init_hashtable): Initialize n__has_attribute__.
	* pch.c (cpp_read_state): Initialize n__has_attribute__.
	* traditional.c (enum ls): Add ls_has_attribute, ls_has_attribute_close;
	(_cpp_scan_out_logical_line): Attend to __has_attribute__.


gcc/c-family:

2014-11-10  Edward Smith-Rowland  <3dw4rd@verizon.net>

	* c-cppbuiltin.c (__has_attribute, __has_cpp_attribute): New macros;
	(__cpp_rtti, __cpp_exceptions): New macros for C++98;
	(__cpp_range_based_for, __cpp_initializer_lists,
	__cpp_delegating_constructors, __cpp_nsdmi,
	__cpp_inheriting_constructors, __cpp_ref_qualifiers): New macros
	for C++11; (__cpp_attribute_deprecated): Remove in favor of
	__has_cpp_attribute.
	* c-lex.c (cb_has_attribute): New callback CPP function;
	(init_c_lex): Set has_attribute callback.


gcc/testsuite:

2014-11-10  Edward Smith-Rowland  <3dw4rd@verizon.net>

	* g++.dg/cpp1y/feat-cxx11.C: Test new feature macros for C++98
	and C++11; Test existence of __has_cpp_attribute;  Test C++11
	attributes.
	* g++.dg/cpp1y/feat-cxx11-neg.C: Ditto.
	* g++.dg/cpp1y/feat-cxx14.C: Ditto and test for C++14 attributes.
	* g++.dg/cpp1y/feat-cxx98.C: Test new feature macros for C++98.
	* g++.dg/cpp1y/feat-cxx98-neg.C: Ditto.
	* g++.dg/cpp1y/feat-neg.C: Test that __cpp_rtti, _cpp_exceptions
	will be undefined for -fno-rtti -fno-exceptions.

From-SVN: r217292
This commit is contained in:
Edward Smith-Rowland 2014-11-10 15:53:12 +00:00 committed by Edward Smith-Rowland
parent 6d64f20c8d
commit 42fd12b1e7
18 changed files with 424 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/c-family/ChangeLog
View File

@ -1,3 +1,15 @@
2014-11-10 Edward Smith-Rowland <3dw4rd@verizon.net>
* c-cppbuiltin.c (__has_attribute, __has_cpp_attribute): New macros;
(__cpp_rtti, __cpp_exceptions): New macros for C++98;
(__cpp_range_based_for, __cpp_initializer_lists,
__cpp_delegating_constructors, __cpp_nsdmi,
__cpp_inheriting_constructors, __cpp_ref_qualifiers): New macros
for C++11; (__cpp_attribute_deprecated): Remove in favor of
__has_cpp_attribute.
* c-lex.c (cb_has_attribute): New callback CPP function;
(init_c_lex): Set has_attribute callback.
2014-11-04 Richard Biener <rguenther@suse.de>
* c-common.c (shorten_compare): Do not shorten mixed

25
gcc/c-family/c-cppbuiltin.c
View File

@ -790,11 +790,16 @@ c_cpp_builtins (cpp_reader *pfile)
c_stddef_cpp_builtins ();
/* Set include test macros for all C/C++ (not for just C++11 etc.)
the builtins __has_include__ and __has_include_next__ are defined
The builtins __has_include__ and __has_include_next__ are defined
in libcpp. */
cpp_define (pfile, "__has_include(STR)=__has_include__(STR)");
cpp_define (pfile, "__has_include_next(STR)=__has_include_next__(STR)");
/* Set attribute test macros for all C/C++ (not for just C++11 etc.)
The builtin __has_attribute__ is defined in libcpp. */
cpp_define (pfile, "__has_attribute(STR)=__has_attribute__(STR)");
cpp_define (pfile, "__has_cpp_attribute(STR)=__has_attribute__(STR)");
if (c_dialect_cxx ())
{
if (flag_weak && SUPPORTS_ONE_ONLY)
@ -806,7 +811,10 @@ c_cpp_builtins (cpp_reader *pfile)
cpp_define (pfile, "__DEPRECATED");
if (flag_rtti)
cpp_define (pfile, "__GXX_RTTI");
{
cpp_define (pfile, "__GXX_RTTI");
cpp_define (pfile, "__cpp_rtti=199711");
}
if (cxx_dialect >= cxx11)
cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__");
@ -824,13 +832,18 @@ c_cpp_builtins (cpp_reader *pfile)
cpp_define (pfile, "__cpp_user_defined_literals=200809");
cpp_define (pfile, "__cpp_lambdas=200907");
cpp_define (pfile, "__cpp_constexpr=200704");
cpp_define (pfile, "__cpp_range_based_for=200907");
cpp_define (pfile, "__cpp_static_assert=200410");
cpp_define (pfile, "__cpp_decltype=200707");
cpp_define (pfile, "__cpp_attributes=200809");
cpp_define (pfile, "__cpp_rvalue_reference=200610");
cpp_define (pfile, "__cpp_variadic_templates=200704");
cpp_define (pfile, "__cpp_initializer_lists=200806");
cpp_define (pfile, "__cpp_delegating_constructors=200604");
cpp_define (pfile, "__cpp_nsdmi=200809");
cpp_define (pfile, "__cpp_inheriting_constructors=200802");
cpp_define (pfile, "__cpp_ref_qualifiers=200710");
cpp_define (pfile, "__cpp_alias_templates=200704");
cpp_define (pfile, "__cpp_attribute_deprecated=201309");
}
if (cxx_dialect > cxx11)
{
@ -853,7 +866,11 @@ c_cpp_builtins (cpp_reader *pfile)
/* Note that we define this for C as well, so that we know if
__attribute__((cleanup)) will interface with EH. */
if (flag_exceptions)
cpp_define (pfile, "__EXCEPTIONS");
{
cpp_define (pfile, "__EXCEPTIONS");
if (c_dialect_cxx ())
cpp_define (pfile, "__cpp_exceptions=199711");
}
/* Represents the C++ ABI version, always defined so it can be used while
preprocessing C and assembler. */

73
gcc/c-family/c-lex.c
View File

@ -37,6 +37,8 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "wide-int.h"
#include "attribs.h"
/* We may keep statistics about how long which files took to compile. */
static int header_time, body_time;
static splay_tree file_info_tree;
@ -62,6 +64,7 @@ static void cb_ident (cpp_reader *, unsigned int, const cpp_string *);
static void cb_def_pragma (cpp_reader *, unsigned int);
static void cb_define (cpp_reader *, unsigned int, cpp_hashnode *);
static void cb_undef (cpp_reader *, unsigned int, cpp_hashnode *);
static int cb_has_attribute (cpp_reader *);
void
init_c_lex (void)
@ -86,6 +89,7 @@ init_c_lex (void)
cb->def_pragma = cb_def_pragma;
cb->valid_pch = c_common_valid_pch;
cb->read_pch = c_common_read_pch;
cb->has_attribute = cb_has_attribute;
/* Set the debug callbacks if we can use them. */
if ((debug_info_level == DINFO_LEVEL_VERBOSE
@ -283,6 +287,75 @@ cb_undef (cpp_reader * ARG_UNUSED (pfile), source_location loc,
(*debug_hooks->undef) (SOURCE_LINE (map, loc),
(const char *) NODE_NAME (node));
}
/* Callback for has_attribute. */
static int
cb_has_attribute (cpp_reader *pfile)
{
int result = 0;
bool paren = false;
tree attr_ns = NULL_TREE, attr_id = NULL_TREE, attr_name = NULL_TREE;
const cpp_token *token;
token = cpp_get_token (pfile);
if (token->type == CPP_OPEN_PAREN)
{
paren = true;
token = cpp_get_token (pfile);
}
if (token->type == CPP_NAME)
{
//node = token->val.node.node;
const cpp_token *nxt_token = cpp_peek_token (pfile, 0);
if (c_dialect_cxx() && nxt_token->type == CPP_SCOPE)
{
nxt_token = cpp_get_token (pfile); // Eat scope.
nxt_token = cpp_get_token (pfile);
if (nxt_token->type == CPP_NAME)
{
attr_ns = get_identifier (
(const char *) cpp_token_as_text (pfile, token));
attr_id = get_identifier (
(const char *) cpp_token_as_text (pfile, nxt_token));
attr_name = build_tree_list (attr_ns, attr_id);
}
else
cpp_error (pfile, CPP_DL_ERROR,
"attribute identifier required after scope");
}
else
{
attr_ns = get_identifier ("gnu");
attr_id = get_identifier (
(const char *) cpp_token_as_text (pfile, token));
attr_name = build_tree_list (attr_ns, attr_id);
}
if (attr_name)
{
const struct attribute_spec *attr = lookup_attribute_spec (attr_name);
if (attr)
{
if (is_attribute_p ("noreturn", TREE_VALUE (attr_name)))
result = 200809;
else if (is_attribute_p ("deprecated", TREE_VALUE (attr_name)))
result = 201309;
else
result = 1;
}
}
}
else
cpp_error (pfile, CPP_DL_ERROR,
"operator \"__has_attribute__\" requires an identifier");
if (paren && cpp_get_token (pfile)->type != CPP_CLOSE_PAREN)
cpp_error (pfile, CPP_DL_ERROR,
"missing ')' after \"__has_attribute__\"");
return result;
}
/* Read a token and return its type. Fill *VALUE with its value, if
applicable. Fill *CPP_FLAGS with the token's flags, if it is

12
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,15 @@
2014-11-10 Edward Smith-Rowland <3dw4rd@verizon.net>
* g++.dg/cpp1y/feat-cxx11.C: Test new feature macros for C++98
and C++11; Test existence of __has_cpp_attribute; Test C++11
attributes.
* g++.dg/cpp1y/feat-cxx11-neg.C: Ditto.
* g++.dg/cpp1y/feat-cxx14.C: Ditto and test for C++14 attributes.
* g++.dg/cpp1y/feat-cxx98.C: Test new feature macros for C++98.
* g++.dg/cpp1y/feat-cxx98-neg.C: Ditto.
* g++.dg/cpp1y/feat-neg.C: Test that __cpp_rtti, _cpp_exceptions
will be undefined for -fno-rtti -fno-exceptions.
2014-11-10 Richard Biener <rguenther@suse.de>
PR tree-optimization/63800

10
gcc/testsuite/g++.dg/cpp1y/feat-cxx11-neg.C
View File

@ -41,9 +41,13 @@
# error "__cpp_runtime_arrays" // { dg-error "error" }
#endif
// Attribute checks:
// C++14 attributes:
// Attribute [[deprecated]] is allowed in C++11 as an extension (with pedwarn).
//#ifndef __cpp_attribute_deprecated
//# error "__cpp_attribute_deprecated"
//#ifdef __has_cpp_attribute
//# if __has_cpp_attribute(deprecated) == 201309
//# error "__has_cpp_attribute(deprecated)" // { }
//# endif
//#else
//# error "__has_cpp_attribute"
//#endif

87
gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C
View File

@ -1,6 +1,20 @@
// { dg-do compile }
// { dg-options "-std=gnu++11" }
// C++98 features:
#ifndef __cpp_rtti
# error "__cpp_rtti"
#elif __cpp_rtti != 199711
# error "__cpp_rtti != 199711"
#endif
#ifndef __cpp_exceptions
# error "__cpp_exceptions"
#elif __cpp_exceptions != 199711
# error "__cpp_exceptions != 199711"
#endif
// C++11 features:
#ifndef __cpp_unicode_characters
@ -39,6 +53,12 @@
# error "__cpp_constexpr != 200704"
#endif
#ifndef __cpp_range_based_for
# error "__cpp_range_based_for"
#elif __cpp_range_based_for != 200907
# error "__cpp_range_based_for != 200907"
#endif
#ifndef __cpp_static_assert
# error "__cpp_static_assert"
#elif __cpp_static_assert != 200410
@ -69,6 +89,36 @@
# error "__cpp_variadic_templates != 200704"
#endif
#ifndef __cpp_initializer_lists
# error "__cpp_initializer_lists"
#elif __cpp_initializer_lists != 200806
# error "__cpp_initializer_lists != 200806"
#endif
#ifndef __cpp_delegating_constructors
# error "__cpp_delegating_constructors"
#elif __cpp_delegating_constructors != 200604
# error "__cpp_delegating_constructors != 200604"
#endif
#ifndef __cpp_nsdmi
# error "__cpp_nsdmi"
#elif __cpp_nsdmi != 200809
# error "__cpp_nsdmi != 200809"
#endif
#ifndef __cpp_inheriting_constructors
# error "__cpp_inheriting_constructors"
#elif __cpp_inheriting_constructors!= 200802
# error "__cpp_inheriting_constructors != 200802"
#endif
#ifndef __cpp_ref_qualifiers
# error "__cpp_ref_qualifiers"
#elif __cpp_ref_qualifiers != 200710
# error "__cpp_ref_qualifiers != 200710"
#endif
#ifndef __cpp_alias_templates
# error "__cpp_alias_templates"
#elif __cpp_alias_templates != 200704
@ -83,11 +133,38 @@
# error "__cpp_binary_literals != 201304"
#endif
// Attribute checks:
// C++11 attributes:
#ifdef __has_cpp_attribute
# if ! __has_cpp_attribute(noreturn)
# error "__has_cpp_attribute(noreturn)"
# elif __has_cpp_attribute(noreturn) != 200809
# error "__has_cpp_attribute(noreturn) != 200809"
# endif
#else
# error "__has_cpp_attribute"
#endif
#ifdef __has_cpp_attribute
// Attribute carries_dependency not in yet.
//# if ! __has_cpp_attribute(carries_dependency)
//# error "__has_cpp_attribute(carries_dependency)"
//# elif __has_cpp_attribute(carries_dependency) != 200809
//# error "__has_cpp_attribute(carries_dependency) != 200809"
//# endif
#else
# error "__has_cpp_attribute"
#endif
// C++14 attributes:
// Attribute [[deprecated]] is allowed in C++11 as an extension (with pedwarn).
#ifndef __cpp_attribute_deprecated
# error "__cpp_attribute_deprecated"
#elif __cpp_attribute_deprecated != 201309
# error "__cpp_attribute_deprecated != 201309"
#ifdef __has_cpp_attribute
# if ! __has_cpp_attribute(deprecated)
# error "__has_cpp_attribute(deprecated)"
# elif __has_cpp_attribute(deprecated) != 201309
# error "__has_cpp_attribute(deprecated) != 201309"
# endif
#else
# error "__has_cpp_attribute"
#endif

87
gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
View File

@ -1,6 +1,20 @@
// { dg-do compile { target c++14 } }
// { dg-options "-I${srcdir}/g++.dg/cpp1y -I${srcdir}/g++.dg/cpp1y/testinc" }
// C++98 features:
#ifndef __cpp_rtti
# error "__cpp_rtti"
#elif __cpp_rtti != 199711
# error "__cpp_rtti != 199711"
#endif
#ifndef __cpp_exceptions
# error "__cpp_exceptions"
#elif __cpp_exceptions != 199711
# error "__cpp_exceptions != 199711"
#endif
// C++11 features:
#ifndef __cpp_unicode_characters
@ -39,6 +53,12 @@
# error "__cpp_constexpr != 200704"
#endif
#ifndef __cpp_range_based_for
# error "__cpp_range_based_for"
#elif __cpp_range_based_for != 200907
# error "__cpp_range_based_for != 200907"
#endif
#ifndef __cpp_static_assert
# error "__cpp_static_assert"
#elif __cpp_static_assert != 200410
@ -69,6 +89,36 @@
# error "__cpp_variadic_templates != 200704"
#endif
#ifndef __cpp_initializer_lists
# error "__cpp_initializer_lists"
#elif __cpp_initializer_lists != 200806
# error "__cpp_initializer_lists != 200806"
#endif
#ifndef __cpp_delegating_constructors
# error "__cpp_delegating_constructors"
#elif __cpp_delegating_constructors != 200604
# error "__cpp_delegating_constructors != 200604"
#endif
#ifndef __cpp_nsdmi
# error "__cpp_nsdmi"
#elif __cpp_nsdmi != 200809
# error "__cpp_nsdmi != 200809"
#endif
#ifndef __cpp_inheriting_constructors
# error "__cpp_inheriting_constructors"
#elif __cpp_inheriting_constructors!= 200802
# error "__cpp_inheriting_constructors != 200802"
#endif
#ifndef __cpp_ref_qualifiers
# error "__cpp_ref_qualifiers"
#elif __cpp_ref_qualifiers != 200710
# error "__cpp_ref_qualifiers != 200710"
#endif
#ifndef __cpp_alias_templates
# error "__cpp_alias_templates"
#elif __cpp_alias_templates != 200704
@ -145,12 +195,39 @@
# error "__cpp_runtime_arrays != 201304"
#endif
// Attribute checks:
// C++11 attributes:
#ifndef __cpp_attribute_deprecated
# error "__cpp_attribute_deprecated"
#elif __cpp_attribute_deprecated != 201309
# error "__cpp_attribute_deprecated != 201309"
#ifdef __has_cpp_attribute
# if ! __has_cpp_attribute(noreturn)
# error "__has_cpp_attribute(noreturn)"
# elif __has_cpp_attribute(noreturn) != 200809
# error "__has_cpp_attribute(noreturn) != 200809"
# endif
#else
# error "__has_cpp_attribute"
#endif
// Attribute carries_dependency not in yet.
//#ifdef __has_cpp_attribute
//# if ! __has_cpp_attribute(carries_dependency)
//# error "__has_cpp_attribute(carries_dependency)"
//# elif __has_cpp_attribute(carries_dependency) != 200809
//# error "__has_cpp_attribute(carries_dependency) != 200809"
//# endif
//#else
//# error "__has_cpp_attribute"
//#endif
// C++14 attributes:
#ifdef __has_cpp_attribute
# if ! __has_cpp_attribute(deprecated)
# error "__has_cpp_attribute(deprecated)"
# elif __has_cpp_attribute(deprecated) != 201309
# error "__has_cpp_attribute(deprecated) != 201309"
# endif
#else
# error "__has_cpp_attribute"
#endif
// Include checks:

50
gcc/testsuite/g++.dg/cpp1y/feat-cxx98-neg.C
View File

@ -51,6 +51,26 @@
# error "__cpp_variadic_templates" // { dg-error "error" }
#endif
#ifndef __cpp_initializer_lists
# error "__cpp_initializer_lists" // { dg-error "error" }
#endif
#ifndef __cpp_delegating_constructors
# error "__cpp_delegating_constructors" // { dg-error "error" }
#endif
#ifndef __cpp_nsdmi
# error "__cpp_nsdmi" // { dg-error "error" }
#endif
#ifndef __cpp_inheriting_constructors
# error "__cpp_inheriting_constructors" // { dg-error "error" }
#endif
#ifndef __cpp_ref_qualifiers
# error "__cpp_ref_qualifiers" // { dg-error "error" }
#endif
#ifndef __cpp_alias_templates
# error "__cpp_alias_templates" // { dg-error "error" }
#endif
@ -95,8 +115,32 @@
//# error "__cpp_sized_deallocation"
//#endif
// Attribute checks:
// C++11 attributes:
#ifndef __cpp_attribute_deprecated
# error "__cpp_attribute_deprecated" // { dg-error "error" }
#ifdef __has_cpp_attribute
# if __has_cpp_attribute(noreturn) == 200809
# error "__has_cpp_attribute(noreturn) == 200809" // { dg-error "error" }
# endif
#else
# error "__has_cpp_attribute"
#endif
// Attribute carries_dependency not in yet.
//#ifdef __has_cpp_attribute
//# if __has_cpp_attribute(carries_dependency) == 200809
//# error "__has_cpp_attribute(carries_dependency) == 200809" // { }
//# endif
//#else
//# error "__has_cpp_attribute"
//#endif
// C++14 attributes:
// Attribute [[deprecated]] is allowed in C++11 as an extension (with pedwarn).
//#ifdef __has_cpp_attribute
//# if __has_cpp_attribute(deprecated) == 201309
//# error "__has_cpp_attribute(deprecated)" // { }
//# endif
//#else
//# error "__has_cpp_attribute"
//#endif

14
gcc/testsuite/g++.dg/cpp1y/feat-cxx98.C
View File

@ -1,6 +1,20 @@
// { dg-do compile { target c++98_only } }
// { dg-options "" }
// C++98 features:
#ifndef __cpp_rtti
# error "__cpp_rtti"
#elif __cpp_rtti != 199711
# error "__cpp_rtti != 199711"
#endif
#ifndef __cpp_exceptions
# error "__cpp_exceptions"
#elif __cpp_exceptions != 199711
# error "__cpp_exceptions != 199711"
#endif
// C++14 features allowed in C++98 in non-ANSI modes:
#ifndef __cpp_binary_literals

12
gcc/testsuite/g++.dg/cpp1y/feat-neg.C Normal file
View File

@ -0,0 +1,12 @@
// { dg-do compile }
// { dg-options "-fno-rtti -fno-exceptions" }
// C++98 features with explicit opt-out:
#ifndef __cpp_rtti
# error "__cpp_rtti" // { dg-error "error" }
#endif
#ifndef __cpp_exceptions
# error "__cpp_exceptions" // { dg-error "error" }
#endif

13
libcpp/ChangeLog
View File

@ -1,3 +1,16 @@
2014-11-10 Edward Smith-Rowland <3dw4rd@verizon.net>
* include/cpplib.h (cpp_callbacks): Add has_attribute.
* internal.h (lexer_state): Add in__has_attribute__.
* directives.c (lex_macro_node): Prevent use of __has_attribute__
as a macro.
* expr.c (parse_has_attribute): New function; (eval_token): Look for
__has_attribute__ and route to parse_has_attribute.
* identifiers.c (_cpp_init_hashtable): Initialize n__has_attribute__.
* pch.c (cpp_read_state): Initialize n__has_attribute__.
* traditional.c (enum ls): Add ls_has_attribute, ls_has_attribute_close;
(_cpp_scan_out_logical_line): Attend to __has_attribute__.
2014-11-06 Joseph Myers <joseph@codesourcery.com>
* include/cpp-id-data.h (struct cpp_macro): Update comment

4
libcpp/directives.c
View File

@ -571,6 +571,10 @@ lex_macro_node (cpp_reader *pfile, bool is_def_or_undef)
|| node == pfile->spec_nodes.n__has_include_next__))
cpp_error (pfile, CPP_DL_ERROR,
"\"__has_include__\" cannot be used as a macro name");
else if (is_def_or_undef
&& node == pfile->spec_nodes.n__has_attribute__)
cpp_error (pfile, CPP_DL_ERROR,
"\"__has_attribute__\" cannot be used as a macro name");
else if (! (node->flags & NODE_POISONED))
return node;
}

21
libcpp/expr.c
View File

@ -65,6 +65,7 @@ static unsigned int interpret_int_suffix (cpp_reader *, const uchar *, size_t);
static void check_promotion (cpp_reader *, const struct op *);
static cpp_num parse_has_include (cpp_reader *, enum include_type);
static cpp_num parse_has_attribute (cpp_reader *);
/* Token type abuse to create unary plus and minus operators. */
#define CPP_UPLUS ((enum cpp_ttype) (CPP_LAST_CPP_OP + 1))
@ -1054,6 +1055,8 @@ eval_token (cpp_reader *pfile, const cpp_token *token,
return parse_has_include (pfile, IT_INCLUDE);
else if (token->val.node.node == pfile->spec_nodes.n__has_include_next__)
return parse_has_include (pfile, IT_INCLUDE_NEXT);
else if (token->val.node.node == pfile->spec_nodes.n__has_attribute__)
return parse_has_attribute (pfile);
else if (CPP_OPTION (pfile, cplusplus)
&& (token->val.node.node == pfile->spec_nodes.n_true
|| token->val.node.node == pfile->spec_nodes.n_false))
@ -2147,3 +2150,21 @@ parse_has_include (cpp_reader *pfile, enum include_type type)
return result;
}
/* Handle meeting "__has_attribute__" in a preprocessor expression. */
static cpp_num
parse_has_attribute (cpp_reader *pfile)
{
pfile->state.in__has_attribute__++;
cpp_num result;
result.unsignedp = false;
result.high = 0;
result.overflow = false;
result.low = pfile->cb.has_attribute (pfile);
pfile->state.in__has_attribute__--;
return result;
}

1
libcpp/identifiers.c
View File

@ -72,6 +72,7 @@ _cpp_init_hashtable (cpp_reader *pfile, cpp_hash_table *table)
s->n__VA_ARGS__->flags |= NODE_DIAGNOSTIC;
s->n__has_include__ = cpp_lookup (pfile, DSC("__has_include__"));
s->n__has_include_next__ = cpp_lookup (pfile, DSC("__has_include_next__"));
s->n__has_attribute__ = cpp_lookup (pfile, DSC("__has_attribute__"));
}
/* Tear down the identifier hash table. */

3
libcpp/include/cpplib.h
View File

@ -580,6 +580,9 @@ struct cpp_callbacks
Second argument is the location of the start of the current expansion. */
void (*used) (cpp_reader *, source_location, cpp_hashnode *);
/* Callback to identify whether an attribute exists. */
int (*has_attribute) (cpp_reader *);
/* Callback that can change a user builtin into normal macro. */
bool (*user_builtin_macro) (cpp_reader *, cpp_hashnode *);
};

4
libcpp/internal.h
View File

@ -261,6 +261,9 @@ struct lexer_state
/* Nonzero if in a __has_include__ or __has_include_next__ statement. */
unsigned char in__has_include__;
/* Nonzero if in a __has_attribute__ statement. */
unsigned char in__has_attribute__;
/* Nonzero if prevent_expansion is true only because output is
being discarded. */
unsigned char discarding_output;
@ -284,6 +287,7 @@ struct spec_nodes
cpp_hashnode *n__VA_ARGS__; /* C99 vararg macros */
cpp_hashnode *n__has_include__; /* __has_include__ operator */
cpp_hashnode *n__has_include_next__; /* __has_include_next__ operator */
cpp_hashnode *n__has_attribute__; /* __has_attribute__ operator */
};
typedef struct _cpp_line_note _cpp_line_note;

1
libcpp/pch.c
View File

@ -835,6 +835,7 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f,
s->n__VA_ARGS__ = cpp_lookup (r, DSC("__VA_ARGS__"));
s->n__has_include__ = cpp_lookup (r, DSC("__has_include__"));
s->n__has_include_next__ = cpp_lookup (r, DSC("__has_include_next__"));
s->n__has_attribute__ = cpp_lookup (r, DSC("__has_attribute__"));
}
old_state = r->state;

18
libcpp/traditional.c
View File

@ -76,7 +76,9 @@ enum ls {ls_none = 0, /* Normal state. */
ls_predicate, /* After the predicate, maybe paren? */
ls_answer, /* In answer to predicate. */
ls_has_include, /* After __has_include__. */
ls_has_include_close}; /* Looking for ')' of __has_include__. */
ls_has_include_close, /* Looking for ')' of __has_include__. */
ls_has_attribute, /* After __has_attribute__. */
ls_has_attribute_close}; /* Looking for ')' of __has_attribute__. */
/* Lexing TODO: Maybe handle space in escaped newlines. Stop lex.c
from recognizing comments and directives during its lexing pass. */
@ -533,6 +535,12 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
lex_state = ls_has_include;
continue;
}
else if (pfile->state.in_expression
&& node == pfile->spec_nodes.n__has_attribute__)
{
lex_state = ls_has_attribute;
continue;
}
}
break;
@ -558,6 +566,8 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
lex_state = ls_defined_close;
else if (lex_state == ls_has_include)
lex_state = ls_has_include_close;
else if (lex_state == ls_has_attribute)
lex_state = ls_has_attribute_close;
}
break;
@ -596,7 +606,8 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
}
}
else if (lex_state == ls_answer || lex_state == ls_defined_close
|| lex_state == ls_has_include_close)
|| lex_state == ls_has_include_close
|| lex_state == ls_has_attribute_close)
lex_state = ls_none;
}
break;
@ -678,7 +689,8 @@ _cpp_scan_out_logical_line (cpp_reader *pfile, cpp_macro *macro)
else if (lex_state == ls_hash
|| lex_state == ls_predicate
|| lex_state == ls_defined
|| lex_state == ls_has_include)
|| lex_state == ls_has_include
|| lex_state == ls_has_attribute)
lex_state = ls_none;
/* ls_answer and ls_defined_close keep going until ')'. */