mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-21 15:50:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

call.c (is_subseq): Handle ck_aggr, ck_list.

Browse Source 
* call.c (is_subseq): Handle ck_aggr, ck_list.
	(compare_ics): Treat an aggregate or ambiguous conversion to the
	same type as involving the same function.

From-SVN: r160804
This commit is contained in:
Jason Merrill 2010-06-15 15:58:35 -04:00 committed by Jason Merrill
parent 6ab4e30772
commit 756bcf03e2
4 changed files with 42 additions and 3 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 @@
2010-06-15 Jason Merrill <jason@redhat.com>
* call.c (is_subseq): Handle ck_aggr, ck_list.
(compare_ics): Treat an aggregate or ambiguous conversion to the
same type as involving the same function.
2010-06-13 Shujing Zhao <pearly.zhao@oracle.com>
* typeck.c (convert_for_assignment): Fix comment. Change message

20
gcc/cp/call.c
View File

@ -6578,6 +6578,8 @@ is_subseq (conversion *ics1, conversion *ics2)
if (ics2->kind == ck_user
|| ics2->kind == ck_ambig
|| ics2->kind == ck_aggr
|| ics2->kind == ck_list
|| ics2->kind == ck_identity)
/* At this point, ICS1 cannot be a proper subsequence of
ICS2. We can get a USER_CONV when we are comparing the
@ -6762,13 +6764,25 @@ compare_ics (conversion *ics1, conversion *ics2)
for (t1 = ics1; t1->kind != ck_user; t1 = t1->u.next)
if (t1->kind == ck_ambig || t1->kind == ck_aggr)
return 0;
break;
for (t2 = ics2; t2->kind != ck_user; t2 = t2->u.next)
if (t2->kind == ck_ambig || t2->kind == ck_aggr)
return 0;
break;
if (t1->cand->fn != t2->cand->fn)
if (t1->kind != t2->kind)
return 0;
else if (t1->kind == ck_user)
{
if (t1->cand->fn != t2->cand->fn)
return 0;
}
else
{
/* For ambiguous or aggregate conversions, use the target type as
a proxy for the conversion function. */
if (!same_type_ignoring_top_level_qualifiers_p (t1->type, t2->type))
return 0;
}
/* We can just fall through here, after setting up
FROM_TYPE1 and FROM_TYPE2. */

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2010-06-15 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/initlist39.C: New.
2010-06-15 Sebastian Pop <sebastian.pop@amd.com>
PR middle-end/44391

15
gcc/testsuite/g++.dg/cpp0x/initlist39.C Normal file
View File

@ -0,0 +1,15 @@
// { dg-options -std=c++0x }
struct A { int i; };
void f (const A &);
void f (A &&);
void g (A, int);
void g (A, double);
int main()
{
f ( { 1 } );
g ( { 1 }, 1 );
}