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

PR c++/80891 (#1)

Browse source 
PR c++/80891 (#1)
	* pt.c (most_specialized_instantiation): Cope with duplicate
	instantiations.

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

From-SVN: r248573
This commit is contained in:
Nathan Sidwell 2017-05-29 14:08:04 +00:00 • committed by Nathan Sidwell
parent 58dec01056
commit e514ab0c32
4 changed files with 47 additions and 20 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 (#1)
* pt.c (most_specialized_instantiation): Cope with duplicate
instantiations.
PR c++/80891 (#3)
* cp-tree.h (build_min_nt_call_vec): Declare.
* decl.c (build_offset_ref_call_from_tree): Call it.

41
gcc/cp/pt.c
View file

@ -21728,31 +21728,32 @@ most_specialized_instantiation (tree templates)
champ = templates;
for (fn = TREE_CHAIN (templates); fn; fn = TREE_CHAIN (fn))
{
int fate = more_specialized_inst (TREE_VALUE (champ), TREE_VALUE (fn));
if (fate == -1)
champ = fn;
else if (!fate)
{
/* Equally specialized, move to next function. If there
is no next function, nothing's most specialized. */
fn = TREE_CHAIN (fn);
if (TREE_VALUE (champ) != TREE_VALUE (fn))
{
int fate = more_specialized_inst (TREE_VALUE (champ), TREE_VALUE (fn));
if (fate == -1)
champ = fn;
if (!fn)
break;
}
}
else if (!fate)
{
/* Equally specialized, move to next function. If there
is no next function, nothing's most specialized. */
fn = TREE_CHAIN (fn);
champ = fn;
if (!fn)
break;
}
}
if (champ)
/* Now verify that champ is better than everything earlier in the
instantiation list. */
for (fn = templates; fn != champ; fn = TREE_CHAIN (fn)) {
if (more_specialized_inst (TREE_VALUE (champ), TREE_VALUE (fn)) != 1)
{
champ = NULL_TREE;
break;
}
}
for (fn = templates; fn != champ; fn = TREE_CHAIN (fn))
if (TREE_VALUE (champ) != TREE_VALUE (fn)
&& more_specialized_inst (TREE_VALUE (champ), TREE_VALUE (fn)) != 1)
{
champ = NULL_TREE;
break;
}
processing_template_decl--;

3
gcc/testsuite/ChangeLog
View file

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

19
gcc/testsuite/g++.dg/lookup/pr80891-1.C Normal file
View file

@ -0,0 +1,19 @@
// PR c++/80891 part 1
// std::endl is found via two paths and most_specialized_instantiation
// gets confused.
namespace std {
struct A {
void operator<<(A(A));
};
template <typename _CharT, typename _Traits> _CharT endl(_Traits);
A a;
}
using std::endl;
void chi_squared_sample_sized()
{
using namespace std;
a << endl;
}