ad1a3914ae
__has_include is funky in that it is macro-like from the POV of #ifdef and friends, but lexes its parenthesize argument #include-like. We were failing the second part of that, because we used a forwarding macro to an internal name, and hence always lexed the argument in macro-parameter context. We componded that by not setting the right flag when lexing, so it didn't even know. Mostly users got lucky. This reimplements the handline. 1) Remove the forwarding, but declare object-like macros that expand to themselves. This satisfies the #ifdef requirement 2) Correctly set angled_brackets when lexing the parameter. This tells the lexer (a) <...> is a header name and (b) "..." is too (not a string). 3) Remove the in__has_include lexer state, just tell find_file that that's what's happenning, so it doesn't emit an error. We lose the (undocumented) ability to #undef __has_include. That may well have been an accident of implementation. There are no tests for it. We gain __has_include behaviour for all users of the preprocessors -- not just the C-family ones that defined a forwarding macro. libcpp/ PR preprocessor/80005 * include/cpplib.h (BT_HAS_ATTRIBUTE): Fix comment. * internal.h (struct lexer_state): Delete in__has_include field. (struct spec_nodes): Rename n__has_include{,_next}__ fields. (_cpp_defined_macro_p): New. (_cpp_find_file): Add has_include parm. * directives.c (lex_macro_node): Combine defined, __has_inline{,_next} checking. (do_ifdef, do_ifndef): Use _cpp_defined_macro_p. (_cpp_init_directives): Refactor. * expr.c (parse_defined): Use _cpp_defined_macro_p. (eval_token): Adjust parse_has_include calls. (parse_has_include): Add OP parameter. Reimplement. * files.c (_cpp_find_file): Add HAS_INCLUDE parm. Use it to inhibit error message. (_cpp_stack_include): Adjust _cpp_find_file call. (_cpp_fake_include, _cpp_compare_file_date): Likewise. (open_file_failed): Remove in__has_include check. (_cpp_has_header): Adjust _cpp_find_file call. * identifiers.c (_cpp_init_hashtable): Don't init __has_include{,_next} here ... * init.c (cpp_init_builtins): ... init them here. Define as macros. (cpp_read_main_file): Adjust _cpp_find_file call. * pch.c (cpp_read_state): Adjust __has_include{,_next} access. * traditional.c (_cpp_scan_out_locgical_line): Likewise. gcc/c-family/ PR preprocessor/80005 * c-cppbuiltins.c (c_cpp_builtins): Don't define __has_include{,_next}. gcc/testsuite/ PR preprocessor/80005 * g++.dg/cpp1y/feat-cxx14.C: Adjust. * g++.dg/cpp1z/feat-cxx17.C: Adjust. * g++.dg/cpp2a/feat-cxx2a.C: Adjust. * g++.dg/cpp/pr80005.C: New.
122 lines
3.8 KiB
C
122 lines
3.8 KiB
C
/* Hash tables for the CPP library.
|
|
Copyright (C) 1986-2020 Free Software Foundation, Inc.
|
|
Written by Per Bothner, 1994.
|
|
Based on CCCP program by Paul Rubin, June 1986
|
|
Adapted to ANSI C, Richard Stallman, Jan 1987
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 3, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
In other words, you are welcome to use, share and improve this program.
|
|
You are forbidden to forbid anyone else to use, share and improve
|
|
what you give them. Help stamp out software-hoarding! */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "cpplib.h"
|
|
#include "internal.h"
|
|
|
|
static hashnode alloc_node (cpp_hash_table *);
|
|
|
|
/* Return an identifier node for hashtable.c. Used by cpplib except
|
|
when integrated with the C front ends. */
|
|
static hashnode
|
|
alloc_node (cpp_hash_table *table)
|
|
{
|
|
cpp_hashnode *node;
|
|
|
|
node = XOBNEW (&table->pfile->hash_ob, cpp_hashnode);
|
|
memset (node, 0, sizeof (cpp_hashnode));
|
|
return HT_NODE (node);
|
|
}
|
|
|
|
/* Set up the identifier hash table. Use TABLE if non-null, otherwise
|
|
create our own. */
|
|
void
|
|
_cpp_init_hashtable (cpp_reader *pfile, cpp_hash_table *table)
|
|
{
|
|
struct spec_nodes *s;
|
|
|
|
if (table == NULL)
|
|
{
|
|
pfile->our_hashtable = 1;
|
|
table = ht_create (13); /* 8K (=2^13) entries. */
|
|
table->alloc_node = alloc_node;
|
|
|
|
obstack_specify_allocation (&pfile->hash_ob, 0, 0, xmalloc, free);
|
|
}
|
|
|
|
table->pfile = pfile;
|
|
pfile->hash_table = table;
|
|
|
|
/* Now we can initialize things that use the hash table. */
|
|
_cpp_init_directives (pfile);
|
|
_cpp_init_internal_pragmas (pfile);
|
|
|
|
s = &pfile->spec_nodes;
|
|
s->n_defined = cpp_lookup (pfile, DSC("defined"));
|
|
s->n_true = cpp_lookup (pfile, DSC("true"));
|
|
s->n_false = cpp_lookup (pfile, DSC("false"));
|
|
s->n__VA_ARGS__ = cpp_lookup (pfile, DSC("__VA_ARGS__"));
|
|
s->n__VA_ARGS__->flags |= NODE_DIAGNOSTIC;
|
|
s->n__VA_OPT__ = cpp_lookup (pfile, DSC("__VA_OPT__"));
|
|
s->n__VA_OPT__->flags |= NODE_DIAGNOSTIC;
|
|
/* __has_include{,_next} are inited in cpp_init_builtins. */
|
|
}
|
|
|
|
/* Tear down the identifier hash table. */
|
|
void
|
|
_cpp_destroy_hashtable (cpp_reader *pfile)
|
|
{
|
|
if (pfile->our_hashtable)
|
|
{
|
|
ht_destroy (pfile->hash_table);
|
|
obstack_free (&pfile->hash_ob, 0);
|
|
}
|
|
}
|
|
|
|
/* Returns the hash entry for the STR of length LEN, creating one
|
|
if necessary. */
|
|
cpp_hashnode *
|
|
cpp_lookup (cpp_reader *pfile, const unsigned char *str, unsigned int len)
|
|
{
|
|
/* ht_lookup cannot return NULL. */
|
|
return CPP_HASHNODE (ht_lookup (pfile->hash_table, str, len, HT_ALLOC));
|
|
}
|
|
|
|
/* Determine whether the str STR, of length LEN, is a defined macro. */
|
|
int
|
|
cpp_defined (cpp_reader *pfile, const unsigned char *str, int len)
|
|
{
|
|
cpp_hashnode *node;
|
|
|
|
node = CPP_HASHNODE (ht_lookup (pfile->hash_table, str, len, HT_NO_INSERT));
|
|
|
|
/* If it's a macro, it cannot have been poisoned. */
|
|
return node && cpp_macro_p (node);
|
|
}
|
|
|
|
/* We don't need a proxy since the hash table's identifier comes first
|
|
in cpp_hashnode. However, in case this is ever changed, we have a
|
|
static assertion for it. */
|
|
extern char proxy_assertion_broken[offsetof (struct cpp_hashnode, ident) == 0 ? 1 : -1];
|
|
|
|
/* For all nodes in the hashtable, callback CB with parameters PFILE,
|
|
the node, and V. */
|
|
void
|
|
cpp_forall_identifiers (cpp_reader *pfile, cpp_cb cb, void *v)
|
|
{
|
|
ht_forall (pfile->hash_table, (ht_cb) cb, v);
|
|
}
|