diff options
| author | Jason Merrill <jason@redhat.com> | 2023-03-23 10:43:58 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2023-04-27 11:54:43 -0400 |
| commit | 14e881eb0305090e5b184806b917d492373d32ea (patch) | |
| tree | 4f3ca383d8edce20aae7148ee1ae048e3939775b /gcc | |
| parent | e0cf929d99bebd9a740db6db45d69957514e0c12 (diff) | |
| download | gcc-14e881eb0305090e5b184806b917d492373d32ea.zip gcc-14e881eb0305090e5b184806b917d492373d32ea.tar.gz gcc-14e881eb0305090e5b184806b917d492373d32ea.tar.bz2 | |
c++: print conversion error at candidate location
In testcases like this one, the printing of candidates in a diagnostic has
been longer than necessary because it jumps back and forth between the call
site and the candidate site. So here, we first say at the call site that no
match was found; then we note the candidate site, and then explain why it's
not suitable back at the call site, which means printing the call site line
with caret again. With this patch, the conversion diagnostic is at the same
location as the candidate, so we don't need to print any input line.
gcc/cp/ChangeLog:
* call.cc (print_conversion_rejection): Use iloc_sentinel.
gcc/testsuite/ChangeLog:
* g++.dg/template/copy1.C: Adjust error lines.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/call.cc | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/copy1.C | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index cdd7701..2a06520 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -3847,6 +3847,7 @@ print_conversion_rejection (location_t loc, struct conversion_info *info, if (info->n_arg >= 0) inform (loc, " conversion of argument %d would be ill-formed:", info->n_arg + 1); + iloc_sentinel ils = loc; perform_implicit_conversion (info->to_type, info->from, tf_warning_or_error); } diff --git a/gcc/testsuite/g++.dg/template/copy1.C b/gcc/testsuite/g++.dg/template/copy1.C index a34221d..eacd9e2 100644 --- a/gcc/testsuite/g++.dg/template/copy1.C +++ b/gcc/testsuite/g++.dg/template/copy1.C @@ -6,9 +6,10 @@ struct A { + // { dg-error "reference" "" { target c++14_down } .+1 } A(A&); // { dg-message "A::A" "" { target c++14_down } } template <class T> A(T); // { dg-message "A::A" "" { target c++14_down } } }; -A a = 0; // { dg-error "" "" { target c++14_down } } +A a = 0; // { dg-error "no match" "" { target c++14_down } } |