From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 2475938582BD; Thu, 27 Apr 2023 15:58:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2475938582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682611134; bh=Agc/YTsR6/4cr9oNXIAQ2uaYDI/z8mbG8+EB+0DzLOI=; h=From:To:Subject:Date:From; b=saafwvGlU6W6OanmPr9BOkVzVpNW9904hnHBKAlkyMYmZZMBchkMCCZzerRgqhHd9 2Hs5uLUdpfmsh4IbLIqLdbZfSRiNet3wp0DShQLNp4MD6WUaRCsWISHNqDfTgPzLnO y/HK6bkgVgeq1hwMU/77sWPqHPIXS6W49TswQUPs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-309] c++: print conversion error at candidate location X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/trunk X-Git-Oldrev: e0cf929d99bebd9a740db6db45d69957514e0c12 X-Git-Newrev: 14e881eb0305090e5b184806b917d492373d32ea Message-Id: <20230427155854.2475938582BD@sourceware.org> Date: Thu, 27 Apr 2023 15:58:54 +0000 (GMT) List-Id: https://gcc.gnu.org/g:14e881eb0305090e5b184806b917d492373d32ea commit r14-309-g14e881eb0305090e5b184806b917d492373d32ea Author: Jason Merrill Date: Thu Mar 23 10:43:58 2023 -0400 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. Diff: --- gcc/cp/call.cc | 1 + gcc/testsuite/g++.dg/template/copy1.C | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index cdd7701b9e7..2a06520c0c1 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 a34221df38b..eacd9e2c025 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 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 } }