diff options
| author | Nathan Sidwell <nathan@acm.org> | 2020-01-28 07:58:29 -0800 |
|---|---|---|
| committer | Nathan Sidwell <nathan@acm.org> | 2020-01-28 08:02:17 -0800 |
| commit | 3d056cbfb3484f4037b34c908b26e1c6776c86b5 (patch) | |
| tree | 591410d4cd98b8777276072cc5af998a3f97d97c /libcpp/include | |
| parent | a5d81aaab6d54379cd3835b33d84d9be5c5be099 (diff) | |
| download | gcc-3d056cbfb3484f4037b34c908b26e1c6776c86b5.zip gcc-3d056cbfb3484f4037b34c908b26e1c6776c86b5.tar.gz gcc-3d056cbfb3484f4037b34c908b26e1c6776c86b5.tar.bz2 | |
preprocessor: Make __has_include a builtin macro [PR93452]
The clever hack of '#define __has_include __has_include' breaks -dD
and -fdirectives-only, because that emits definitions. This turns
__has_include into a proper builtin macro. Thus it's never emitted
via -dD, and because use outside of directive processing is undefined,
we can just expand it anywhere.
PR preprocessor/93452
* internal.h (struct spec_nodes): Drop n__has_include{,_next}.
* directives.c (lex_macro_node): Don't check __has_include redef.
* expr.c (eval_token): Drop __has_include eval.
(parse_has_include): Move to ...
* macro.c (builtin_has_include): ... here.
(_cpp_builtin_macro_text): Eval __has_include{,_next}.
* include/cpplib.h (enum cpp_builtin_type): Add BT_HAS_INCLUDE{,_NEXT}.
* init.c (builtin_array): Add them.
(cpp_init_builtins): Drop __has_include{,_next} init here ...
* pch.c (cpp_read_state): ... and here.
* traditional.c (enum ls): Drop has_include states ...
(_cpp_scan_out_logical_line): ... and here.
Diffstat (limited to 'libcpp/include')
| -rw-r--r-- | libcpp/include/cpplib.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 56cbbd8..07caadb 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -860,7 +860,9 @@ enum cpp_builtin_type BT_TIMESTAMP, /* `__TIMESTAMP__' */ BT_COUNTER, /* `__COUNTER__' */ BT_HAS_ATTRIBUTE, /* `__has_attribute(x)' */ - BT_HAS_BUILTIN /* `__has_builtin(x)' */ + BT_HAS_BUILTIN, /* `__has_builtin(x)' */ + BT_HAS_INCLUDE, /* `__has_include(x)' */ + BT_HAS_INCLUDE_NEXT, /* `__has_include_next(x)' */ }; #define CPP_HASHNODE(HNODE) ((cpp_hashnode *) (HNODE)) |