procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/80891 (#4)

Browse source 
PR c++/80891 (#4)
	* ptree.c (cxx_print_xnode): Show internal OVERLOAD structure.
	* tree.c (ovl_insert, ovl_iterator_remove_node): Fix copying
	assert.

	PR c++/80891 (#4)
	* g++.dg/lookup/pr80891-4.C: New.

From-SVN: r248576
This commit is contained in:
Nathan Sidwell 2017-05-29 16:50:41 +00:00 • committed by Nathan Sidwell
parent 3c9cca8848
commit a5cfa13ab9
5 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/ChangeLog
View file

@ -1,5 +1,9 @@
2017-05-29 Nathan Sidwell <nathan@acm.org>
PR c++/80891 (#4)
* ptree.c (cxx_print_xnode): Show internal OVERLOAD structure.
* tree.c (ovl_insert, ovl_iterator_remove_node): Fix copying assert.
Stat hack representation
* name-lookup.c (STAT_HACK_P, STAT_TYPE, STAT_DECL,
MAYBE_STAT_DECL, MAYBE_STAT_TYPE): New.

7
gcc/cp/ptree.c
View file

@ -236,11 +236,8 @@ cxx_print_xnode (FILE *file, tree node, int indent)
indent + 4);
break;
case OVERLOAD:
print_node (file, "name", OVL_NAME (node), indent+4);
for (ovl_iterator iter (node, true); iter; ++iter)
print_node (file,
TREE_CODE (*iter) == OVERLOAD ? "inner" : "function",
*iter, indent+4);
print_node (file, "function", OVL_FUNCTION (node), indent+4);
print_node (file, "next", OVL_CHAIN (node), indent+4);
break;
case TEMPLATE_PARM_INDEX:
print_node (file, "decl", TEMPLATE_PARM_DECL (node), indent+4);

4
gcc/cp/tree.c
View file

@ -2170,7 +2170,7 @@ ovl_insert (tree fn, tree maybe_ovl, bool using_p)
| (OVL_USING_P (maybe_ovl) << 0))))
{
gcc_checking_assert (!OVL_LOOKUP_P (maybe_ovl)
&& (!OVL_USED_P (maybe_ovl) || !copying));
&& (!copying || OVL_USED_P (maybe_ovl)));
if (OVL_USED_P (maybe_ovl))
{
copying = true;
@ -2264,7 +2264,7 @@ ovl_iterator::remove_node (tree overload, tree node)
{
tree probe = *slot;
gcc_checking_assert (!OVL_LOOKUP_P (probe)
&& (!OVL_USED_P (probe) || !copying));
&& (!copying || OVL_USED_P (probe)));
if (OVL_USED_P (probe))
{
copying = true;

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2017-05-29 Nathan Sidwell <nathan@acm.org>
PR c++/80891 (#4)
* g++.dg/lookup/pr80891-4.C: New.
PR c++/80891 (#1)
* g++.dg/lookup/pr80891-1.C: New.

13
gcc/testsuite/g++.dg/lookup/pr80891-4.C Normal file
View file

@ -0,0 +1,13 @@
// PR c++/80891 part 4
// Inserting into an immutable overload set
namespace tuples {
template <class, class> void get();
template <int> void get();
}
using tuples::get;
template <class RandomAccessIterator> void make_iterator_vertex_map() {
RandomAccessIterator a;
a, get;
}
template <class> void get();