OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/77812 (incorrectly rejects valid C++ code that uses enum in template instantiation) 

cp/
	PR c++/77812
	* name-lookup.c (set_namespace_binding_1): An overload of 1 decl
	is a new overload.

	testsuite/
	PR c++/77812
	* g++.dg/pr77812.C: New.

From-SVN: r244335
This commit is contained in:
Nathan Sidwell 2017-01-11 20:37:16 +00:00 committed by Nathan Sidwell
parent 5b33cc835c
commit 01bfd25762
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2017-01-11 Nathan Sidwell <nathan@acm.org>
PR c++/77812
* name-lookup.c (set_namespace_binding_1): An overload of 1 decl
is a new overload.
2017-01-11 Nathan Sidwell <nathan@acm.org>
* name-lookup.c (push_overloaded_decl_1): Refactor OVERLOAD creation.

7
gcc/cp/name-lookup.c
View File

@ -3496,7 +3496,12 @@ set_namespace_binding_1 (tree name, tree scope, tree val)
if (scope == NULL_TREE)
scope = global_namespace;
b = binding_for_name (NAMESPACE_LEVEL (scope), name);
if (!b->value || TREE_CODE (val) == OVERLOAD || val == error_mark_node)
if (!b->value
/* For templates and using we create a single element OVERLOAD.
Look for the chain to know whether this is really augmenting
an existing overload. */
|| (TREE_CODE (val) == OVERLOAD && OVL_CHAIN (val))
|| val == error_mark_node)
b->value = val;
else
supplement_binding (b, val);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-11 Nathan Sidwell <nathan@acm.org>
PR c++/77812
* g++.dg/pr77812.C: New.
2017-01-11 Jakub Jelinek <jakub@redhat.com>
PR c++/71537

18
gcc/testsuite/g++.dg/pr77812.C Normal file
View File

@ -0,0 +1,18 @@
// PR77812
// struct-stat hack failure when first overload is a template
enum f {};
template <typename>
void f ()
{
}
enum f F;
struct g {};
template <typename>
void g ()
{
}
struct g G;