aboutsummaryrefslogtreecommitdiff
path: root/libcpp/pch.c
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@acm.org>2020-01-28 07:58:29 -0800
committerNathan Sidwell <nathan@acm.org>2020-01-28 08:02:17 -0800
commit3d056cbfb3484f4037b34c908b26e1c6776c86b5 (patch)
tree591410d4cd98b8777276072cc5af998a3f97d97c /libcpp/pch.c
parenta5d81aaab6d54379cd3835b33d84d9be5c5be099 (diff)
downloadgcc-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/pch.c')
-rw-r--r--libcpp/pch.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libcpp/pch.c b/libcpp/pch.c
index e631050..fcdf387 100644
--- a/libcpp/pch.c
+++ b/libcpp/pch.c
@@ -811,8 +811,6 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f,
s->n_false = cpp_lookup (r, DSC("false"));
s->n__VA_ARGS__ = cpp_lookup (r, DSC("__VA_ARGS__"));
s->n__VA_OPT__ = cpp_lookup (r, DSC("__VA_OPT__"));
- s->n__has_include = cpp_lookup (r, DSC("__has_include"));
- s->n__has_include_next = cpp_lookup (r, DSC("__has_include_next"));
}
old_state = r->state;