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

call.c (convert_like_real): Give "initializing argument of" information for ambiguous conversion.

Browse Source 
* call.c (convert_like_real): Give "initializing argument of"
	information for ambiguous conversion.  Give source position
	of function.

From-SVN: r160809
This commit is contained in:
Jason Merrill 2010-06-15 16:10:42 -04:00 committed by Jason Merrill
parent e14eaea4d4
commit 0842c29f7b
7 changed files with 25 additions and 17 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 @@
2010-06-15 Jason Merrill <jason@redhat.com> 2010-06-15 Jason Merrill <jason@redhat.com>
* call.c (convert_like_real): Give "initializing argument of"
information for ambiguous conversion. Give source position
of function.
* call.c (print_z_candidates): Do print viable deleted candidates. * call.c (print_z_candidates): Do print viable deleted candidates.
(joust): Don't choose a deleted function just because its worst (joust): Don't choose a deleted function just because its worst
conversion is better than another candidate's worst. conversion is better than another candidate's worst.

18
gcc/cp/call.c
View File

@ -4934,7 +4934,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
{ {
permerror (input_location, "invalid conversion from %qT to %qT", TREE_TYPE (expr), totype); permerror (input_location, "invalid conversion from %qT to %qT", TREE_TYPE (expr), totype);
if (fn) if (fn)
permerror (input_location, " initializing argument %P of %qD", argnum, fn); permerror (DECL_SOURCE_LOCATION (fn),
" initializing argument %P of %qD", argnum, fn);
} }
else else
return error_mark_node; return error_mark_node;
@ -5018,11 +5019,14 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
} }
return expr; return expr;
case ck_ambig: case ck_ambig:
if (!(complain & tf_error)) if (complain & tf_error)
return error_mark_node; {
/* Call build_user_type_conversion again for the error. */ /* Call build_user_type_conversion again for the error. */
return build_user_type_conversion build_user_type_conversion (totype, convs->u.expr, LOOKUP_NORMAL);
(totype, convs->u.expr, LOOKUP_NORMAL); if (fn)
error (" initializing argument %P of %q+D", argnum, fn);
}
return error_mark_node;
case ck_list: case ck_list:
{ {
@ -5110,7 +5114,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
if (diag_kind && fn) if (diag_kind && fn)
{ {
if ((complain & tf_error)) if ((complain & tf_error))
emit_diagnostic (diag_kind, input_location, 0, emit_diagnostic (diag_kind, DECL_SOURCE_LOCATION (fn), 0,
" initializing argument %P of %qD", argnum, fn); " initializing argument %P of %qD", argnum, fn);
else if (diag_kind == DK_ERROR) else if (diag_kind == DK_ERROR)
return error_mark_node; return error_mark_node;

3
gcc/testsuite/g++.dg/cpp0x/initlist15.C
View File

@ -1,5 +1,8 @@
// { dg-options "-std=c++0x" } // { dg-options "-std=c++0x" }
// Just discard errors pointing at header files
// { dg-prune-output "include" }
#include <vector> #include <vector>
#include <typeinfo> #include <typeinfo>

4
gcc/testsuite/g++.dg/cpp0x/initlist19.C
View File

@ -1,8 +1,10 @@
// { dg-options "-std=c++0x" } // { dg-options "-std=c++0x" }
// Allow other errors, too
// { dg-prune-output "error" }
void f(double); void f(double);
int main() int main()
{ {
f({{1}}); // { dg-error "too many braces" } f({{1}}); // { dg-error "too many braces" }
// { dg-error "" "" { target *-*-* } 6 } allow other errors, too
} }

4
gcc/testsuite/g++.dg/expr/cond8.C
View File

@ -3,11 +3,11 @@
struct A struct A
{ {
A(void*); A(void*); // { dg-error "initializing" }
~A(); ~A();
}; };
void foo(const int i, bool b) void foo(const int i, bool b)
{ {
b ? A(0) : i; // { dg-error "conversion|initializing" } b ? A(0) : i; // { dg-error "conversion" }
} }

4
gcc/testsuite/g++.old-deja/g++.bugs/900514_03.C
View File

@ -16,7 +16,7 @@
struct t_0_st_0; struct t_0_st_0;
struct t_0_st_1 { struct t_0_st_1 { // { dg-error "initializing" }
int member; int member;
t_0_st_1 (t_0_st_0&);// { dg-message "note" } t_0_st_1 (t_0_st_0&);// { dg-message "note" }
@ -83,7 +83,7 @@ void t_1_local_init ()
struct t_2_st_0; struct t_2_st_0;
struct t_2_st_1 { struct t_2_st_1 { // { dg-error "initializing" }
int member; int member;
t_2_st_1 (t_2_st_0); // { dg-message "note" } t_2_st_1 (t_2_st_0); // { dg-message "note" }

5
libstdc++-v3/testsuite/ext/ext_pointer/1_neg.cc
View File

@ -92,12 +92,7 @@ void test01(void) {
} }
// { dg-error "invalid conversion " "" { target *-*-* } 314 } // { dg-error "invalid conversion " "" { target *-*-* } 314 }
// { dg-error "initializing argument 1 of" "" { target *-*-* } 314 }
// { dg-error "invalid conversion " "" { target *-*-* } 308 } // { dg-error "invalid conversion " "" { target *-*-* } 308 }
// { dg-error "initializing argument 1 of" "" { target *-*-* } 308 }
// { dg-error "invalid conversion " "" { target *-*-* } 331 } // { dg-error "invalid conversion " "" { target *-*-* } 331 }
// { dg-error "initializing argument 1 of" "" { target *-*-* } 331 }
// { dg-error "invalid conversion " "" { target *-*-* } 339 } // { dg-error "invalid conversion " "" { target *-*-* } 339 }
// { dg-error "initializing argument 1 of" "" { target *-*-* } 339 }
// { dg-excess-errors "In constructor" } // { dg-excess-errors "In constructor" }