From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 3CAFA385840D for ; Wed, 24 Apr 2024 19:28:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3CAFA385840D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3CAFA385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713986921; cv=none; b=RADyLtiO+5Zn5s+JfuZqHSZGXYiNE5dKfogYN+40r5u8hMzh6Rk9W6xLIt1fw29geeDs3HsMVYOFmygJlhXR/kd59zLAwq4SqsfssPs0pVFdG1MS3VbyONlOuO+FZIlhzbnZ11ZCHSs1N9Vu5uceZBGdY7LNyqnaQY/UazBMVFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713986921; c=relaxed/simple; bh=ST3a2zs+/0GWWvE7Urh5EtIMxCJx21GDTr0BFk0FPP8=; h=DKIM-Signature:From:Date:To:Subject:Message-ID:MIME-Version; b=vCpEOLI5XymrQHIxIsSliuQhS8gCt2FZX3ryeVPRZvq8+p9kEydX9lgbnKlbcvHRFg1iGcf+C2XgguEqAsPrG/dGUOt5MNZKNRG0eohNS07gcb3LNcrAy6RrISlfqzpGX/L/bazB+kYZEEtYGmFZs7aheTRe3WsufmsC3q7of54= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713986917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fnk+J8iHASxwaGnOrqp1ux5mqEvHkO3VXdzelXANZW0=; b=Q3QvDP+XlQ9KEcoqYN3BjX2R/y/RWJ+oDvCTMDovo2x5yXL4SDf1M4WLShXETHlqPGP5A9 xzo3tLqGPzYHvX9P6S5OkoytlbVSLj2ehr9B/zGD9ITmCy+6J+SFbHsJ7aYnOVaBm7YP1p y1W5fYiSZAwqx0v1P3frj4miAnZHJT0= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-29-Ku7vg9SzN4K3WeYkInNFlw-1; Wed, 24 Apr 2024 15:28:36 -0400 X-MC-Unique: Ku7vg9SzN4K3WeYkInNFlw-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-79067807374so19218285a.2 for ; Wed, 24 Apr 2024 12:28:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713986913; x=1714591713; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Fkkpsty19KiBXcA3J4HqcREff8pN32LcSWQNo0kaTDA=; b=RhHGHqTnWZBFzp4cETisGtUjO5IqISoOaXdFZWBfAjYR9L9rXIy1Ly3lfD9GbrUeqR xavxeI2kHFKlCLi8CDQNgpI5xTwnTVot5jXoRsaBprQ3ReS6tenyOy3riI7QvjY+hiTt 84GXDhDy0hJdtCIy+j+s3ruA7+dRL2TLhiFhC45mP+qE6EmKgQpzcp4++WYeNWKSglzz qQUN2UXftbG178wrM85U3NN8WjaOd6xVVcQ9/af+W5EfxxgRoTQQF1SoxpPC+zM+CI6H OeE98FUE8Huubr+cxVauS0H2tLpq59WF1dxGgD9RNd6Cyn8QlkZRR/9AjFG4fbH73wCO DVvw== X-Forwarded-Encrypted: i=1; AJvYcCXyXhdHbH/zQuLhgHc+eii2N/U9gje2TjIEzQ4n6d7pwpAfMvvrAVOscAeyzvDguE/CWaNfZf1oBJkUD21vkmQstjeBbB1G8w== X-Gm-Message-State: AOJu0YxHFo9kBZsP+6kODclDAxqdSpWi5rDPprgRMjAk2+KfNPu5Xd7O LuUqW/4/jVyoWyhazIUF3CELMcUpzM5GS/wfBpzdA8kniiMCyT0VleyqtBF1zyIvqLm/ZmYAz0C RijvVj9eVVg9FRPcawqywW36j76648Q3L/g6Z/KzgeRx3TENmTAsw+/Y= X-Received: by 2002:a05:620a:3886:b0:78f:ecb:541d with SMTP id qp6-20020a05620a388600b0078f0ecb541dmr3549443qkn.42.1713986913160; Wed, 24 Apr 2024 12:28:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELFBcNLkJpUmnrv+EyS337s+EjTbFycXPWMS7IRGcRRzAyK5FfiFSBrjJQxcuQNj1NkzMGLQ== X-Received: by 2002:a05:620a:3886:b0:78f:ecb:541d with SMTP id qp6-20020a05620a388600b0078f0ecb541dmr3549427qkn.42.1713986912772; Wed, 24 Apr 2024 12:28:32 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id wa8-20020a05620a4d0800b00790629248d4sm4438391qkn.110.2024.04.24.12.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 12:28:32 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Wed, 24 Apr 2024 15:28:31 -0400 (EDT) To: Patrick Palka cc: David Malcolm , gcc-patches@gcc.gnu.org, Jason Merrill Subject: Re: [PATCH] c++: print source code in print_instantiation_partial_context_line In-Reply-To: <1c0eb371-d3c3-762b-9595-b5b4e9aaeba5@idea> Message-ID: <7f54b319-5648-20c6-b110-e5cc1c139a99@idea> References: <20231003164812.13294-1-dmalcolm@redhat.com> <97fee3fd-40ec-dc65-9ca1-daf991cb09db@idea> <19f955ec-c497-0f11-44af-eebed9702210@idea> <1c0eb371-d3c3-762b-9595-b5b4e9aaeba5@idea> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="8323329-306340493-1713986912=:3760645" X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-306340493-1713986912=:3760645 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT On Wed, 24 Apr 2024, Patrick Palka wrote: > On Tue, 9 Apr 2024, Patrick Palka wrote: > > > On Thu, 19 Oct 2023, Patrick Palka wrote: > > > > > On Tue, 3 Oct 2023, David Malcolm wrote: > > > > > > > As mentioned in my Cauldron talk, this patch adds a call to > > > > diagnostic_show_locus to the "required from here" messages > > > > in print_instantiation_partial_context_line, so that e.g., rather > > > > than the rather mystifying: > > > > > > > > In file included from ../x86_64-pc-linux-gnu/libstdc++-v3/include/memory:78, > > > > from ../../src/demo-1.C:1: > > > > ../x86_64-pc-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h: In instantiation of ‘std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = bar; _Args = {}; __detail::__unique_ptr_t<_Tp> = __detail::__unique_ptr_t]’: > > > > ../../src/demo-1.C:15:32: required from here > > > > ../x86_64-pc-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h:1066:30: error: no matching function for call to ‘bar::bar()’ > > > > 1066 | { return unique_ptr<_Tp>(new _Tp(std::forward<_Args>(__args)...)); } > > > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > ../../src/demo-1.C:10:3: note: candidate: ‘bar::bar(int)’ > > > > 10 | bar (int); > > > > | ^~~ > > > > ../../src/demo-1.C:10:3: note: candidate expects 1 argument, 0 provided > > > > ../../src/demo-1.C:7:7: note: candidate: ‘constexpr bar::bar(const bar&)’ > > > > 7 | class bar : public foo > > > > | ^~~ > > > > ../../src/demo-1.C:7:7: note: candidate expects 1 argument, 0 provided > > > > ../../src/demo-1.C:7:7: note: candidate: ‘constexpr bar::bar(bar&&)’ > > > > ../../src/demo-1.C:7:7: note: candidate expects 1 argument, 0 provided > > > > > > > > we emit: > > > > > > > > In file included from ../x86_64-pc-linux-gnu/libstdc++-v3/include/memory:78, > > > > from ../../src/demo-1.C:1: > > > > ../x86_64-pc-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h: In instantiation of ‘std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = bar; _Args = {}; __detail::__unique_ptr_t<_Tp> = __detail::__unique_ptr_t]’: > > > > ../../src/demo-1.C:15:32: required from here > > > > 15 | return std::make_unique (); > > > > | ~~~~~~~~~~~~~~~~~~~~~~^~ > > > > ../x86_64-pc-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h:1066:30: error: no matching function for call to ‘bar::bar()’ > > > > 1066 | { return unique_ptr<_Tp>(new _Tp(std::forward<_Args>(__args)...)); } > > > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > ../../src/demo-1.C:10:3: note: candidate: ‘bar::bar(int)’ > > > > 10 | bar (int); > > > > | ^~~ > > > > ../../src/demo-1.C:10:3: note: candidate expects 1 argument, 0 provided > > > > ../../src/demo-1.C:7:7: note: candidate: ‘constexpr bar::bar(const bar&)’ > > > > 7 | class bar : public foo > > > > | ^~~ > > > > ../../src/demo-1.C:7:7: note: candidate expects 1 argument, 0 provided > > > > ../../src/demo-1.C:7:7: note: candidate: ‘constexpr bar::bar(bar&&)’ > > > > ../../src/demo-1.C:7:7: note: candidate expects 1 argument, 0 provided > > > > > > > > which shows the code that's leading to the error (the bad call to > > > > std::make_unique). > > > > > > This is great! I noticed however that the source code gets printed in a > > > surprising way in some contexts. Consider: > > > > > > template void f(typename T::type); > > > > > > int main() { > > > f(0); > > > } > > > > > > For this testcase we emit: > > > > > > testcase.C: In function ‘int main()’: > > > testcase.C:4:9: error: no matching function for call to ‘f(int)’ > > > 4 | f(0); > > > | ~~~~~~^~~ > > > testcase.C:1:24: note: candidate: ‘template void f(typename T::type)’ > > > 1 | template void f(typename T::type); > > > | ^ > > > testcase.C:1:24: note: template argument deduction/substitution failed: > > > testcase.C: In substitution of ‘template void f(typename T::type) [with T = int]’: > > > testcase.C:4:9: required from here > > > testcase.C:1:24: note: 4 | f(0); > > > testcase.C:1:24: note: | ~~~~~~^~~ > > > testcase.C:1:24: error: ‘int’ is not a class, struct, or union type > > > 1 | template void f(typename T::type); > > > | ^ > > > > > > In particular the source code part following the "required from here" line > > > > > > testcase.C:4:9: required from here > > > testcase.C:1:24: note: 4 | f(0); > > > testcase.C:1:24: note: | ~~~~~~^~~ > > > > > > seems off, I would have expected it be > > > > > > testcase.C:4:9: required from here > > > 4 | f(0); > > > | ~~~~~~^~~ > > > > > > i.e. without the "testcase.C:1:24: note: " prefix. Does this look > > > expected? (I also wonder if we might want to omit printing the source > > > code altogether in this case, since we already printed that same line > > > earlier during the "no matching function" error?) > > > > Sorry for forgetting to ping this earlier, but I wonder what if anything > > we should do about this for GCC 14? > > Here's another example of the source code rendering issue using a test > from the libstdc++ testsuite: > > > $ g++ -D_GLIBCXX_DEBUG -Wsystem-headers -Wsign-compare -std=c++23 -I libstdc++-v3/testsuite/util libstdc++-v3/testsuite/std/ranges/adaptors/enumerate/1.cc > In file included from /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/version.h:49, > from /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/concepts:36, > from /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/ranges:37, > from libstdc++-v3/testsuite/std/ranges/adaptors/enumerate/1.cc:4: > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc: In instantiation of ‘constexpr void std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::resize_and_overwrite(size_type, _Operation) [with _Operation = std::__format::__formatter_fp::format >(float, std::basic_format_context, wchar_t>&) const::&; _CharT = char; _Traits = std::char_traits; _Alloc = std::allocator; size_type = long unsigned int]’: > [ ... snip ... ] > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/format:4038:23: required from ‘constexpr void std::__format::_Formatting_scanner<_Out, _CharT>::_M_format_arg(std::size_t) [with _Out = std::__format::_Sink_iter; _CharT = wchar_t; std::size_t = long unsigned int]’ > 4038 | std::visit_format_arg([this](auto& __arg) { > | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ > 4039 | using _Type = remove_reference_t; > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4040 | using _Formatter = typename _Context::template formatter_type<_Type>; > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4041 | if constexpr (is_same_v<_Type, monostate>) > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4042 | __format::__invalid_arg_id_in_format_string(); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4043 | else if constexpr (is_same_v<_Type, handle>) > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4044 | __arg.format(this->_M_pc, this->_M_fc); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4045 | else if constexpr (is_default_constructible_v<_Formatter>) > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4046 | { > | ~ > 4047 | _Formatter __f; > | ~~~~~~~~~~~~~~~ > 4048 | this->_M_pc.advance_to(__f.parse(this->_M_pc)); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4049 | this->_M_fc.advance_to(__f.format(__arg, this->_M_fc)); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4050 | } > | ~ > 4051 | else > | ~~~~ > 4052 | static_assert(__format::__formattable_with<_Type, _Context>); > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4053 | }, _M_fc.arg(__id)); > | ~~~~~~~~~~~~~~~~~~~ > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/format:4033:7: required from here > 4033 | _M_format_arg(size_t __id) override > | ^~~~~~~~~~~~~ > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: comparison of integer expressions of different signedness: ‘long int’ and ‘const std::__cxx11::basic_string::size_type’ {aka ‘const long unsigned int’} [-Wsign-compare] > 609 | _GLIBCXX_DEBUG_ASSERT(__r >= 0 && __r <= __n); > | ^~~~~~~~~~~~~~~~~~~~~ > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc: In instantiation of ‘constexpr void std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::resize_and_overwrite(size_type, _Operation) [with _Operation = std::__format::__formatter_fp::format >(double, std::basic_format_context, wchar_t>&) const::&; _CharT = char; _Traits = std::char_traits; _Alloc = std::allocator; size_type = long unsigned int]’: > [ ... snip ... ] > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/format:4038:23: required from ‘constexpr void std::__format::_Formatting_scanner<_Out, _CharT>::_M_format_arg(std::size_t) [with _Out = std::__format::_Sink_iter; _CharT = wchar_t; std::size_t = long unsigned int]’ > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: 4038 | std::visit_format_arg([this](auto& __arg) { > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ > 4039 | using _Type = remove_reference_t; > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4040 | using _Formatter = typename _Context::template formatter_type<_Type>; > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4041 | if constexpr (is_same_v<_Type, monostate>) > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4042 | __format::__invalid_arg_id_in_format_string(); > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4043 | else if constexpr (is_same_v<_Type, handle>) > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4044 | __arg.format(this->_M_pc, this->_M_fc); > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4045 | else if constexpr (is_default_constructible_v<_Formatter>) > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4046 | { > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~ > 4047 | _Formatter __f; > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~ > 4048 | this->_M_pc.advance_to(__f.parse(this->_M_pc)); > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4049 | this->_M_fc.advance_to(__f.format(__arg, this->_M_fc)); > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4050 | } > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~ > 4051 | else > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~ > 4052 | static_assert(__format::__formattable_with<_Type, _Context>); > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > 4053 | }, _M_fc.arg(__id)); > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ~~~~~~~~~~~~~~~~~~~ > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/format:4033:7: required from here > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: 4033 | _M_format_arg(size_t __id) override > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: | ^~~~~~~~~~~~~ > /scratchpad/gcc-build/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc:609:7: warning: comparison of integer expressions of different signedness: ‘long int’ and ‘const std::__cxx11::basic_string::size_type’ {aka ‘const long unsigned int’} [-Wsign-compare] > 609 | _GLIBCXX_DEBUG_ASSERT(__r >= 0 && __r <= __n); > | ^~~~~~~~~~~~~~~~~~~~~ > [ ... snip ... ] > > The instantiation context source code for the first warning get rendered fine, > but for subsequent warnings they contain a spurious "file:line:col: warning: " > prefix which seems to be inherited from the warning before it. I'm testing the following which seems to fix it: diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc index 7074845154e..f38a0d9906a 100644 --- a/gcc/cp/error.cc +++ b/gcc/cp/error.cc @@ -3793,7 +3793,10 @@ print_instantiation_partial_context_line (diagnostic_context *context, : _("required from here\n")); } gcc_rich_location rich_loc (loc); + char *saved_prefix = pp_take_prefix (context->printer); + pp_set_prefix (context->printer, NULL); diagnostic_show_locus (context, &rich_loc, DK_NOTE); + pp_set_prefix (context->printer, saved_prefix); } /* Same as print_instantiation_full_context but less verbose. */ > > > > > > > > > > > > > > > > > > Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. > > > > > > > > OK for trunk? > > > > > > > > > > > > gcc/cp/ChangeLog: > > > > * error.cc (print_instantiation_partial_context_line): Call > > > > diagnostic_show_locus. > > > > > > > > gcc/testsuite/ChangeLog: > > > > * g++.dg/diagnostic/static_assert3.C: Add directives for > > > > additional source printing. > > > > * g++.dg/template/error60.C: New test. > > > > > > > > Signed-off-by: David Malcolm > > > > --- > > > > gcc/cp/error.cc | 2 + > > > > .../g++.dg/diagnostic/static_assert3.C | 7 +++- > > > > gcc/testsuite/g++.dg/template/error60.C | 37 +++++++++++++++++++ > > > > 3 files changed, 45 insertions(+), 1 deletion(-) > > > > create mode 100644 gcc/testsuite/g++.dg/template/error60.C > > > > > > > > diff --git a/gcc/cp/error.cc b/gcc/cp/error.cc > > > > index ef96e140f24..767478cf5fd 100644 > > > > --- a/gcc/cp/error.cc > > > > +++ b/gcc/cp/error.cc > > > > @@ -3774,6 +3774,8 @@ print_instantiation_partial_context_line (diagnostic_context *context, > > > > ? _("recursively required from here\n") > > > > : _("required from here\n")); > > > > } > > > > + gcc_rich_location rich_loc (loc); > > > > + diagnostic_show_locus (context, &rich_loc, DK_NOTE); > > > > } > > > > > > > > /* Same as print_instantiation_full_context but less verbose. */ > > > > diff --git a/gcc/testsuite/g++.dg/diagnostic/static_assert3.C b/gcc/testsuite/g++.dg/diagnostic/static_assert3.C > > > > index 5d363884508..4ec53f17120 100644 > > > > --- a/gcc/testsuite/g++.dg/diagnostic/static_assert3.C > > > > +++ b/gcc/testsuite/g++.dg/diagnostic/static_assert3.C > > > > @@ -5,6 +5,11 @@ > > > > template struct is_same { static constexpr bool value = false; }; > > > > template struct is_same { static constexpr bool value = true; }; > > > > > > > > +/* { dg-begin-multiline-output "" } > > > > + f(0, 1.3); > > > > + ~^~~~~~~~ > > > > + { dg-end-multiline-output "" } */ > > > > + > > > > template > > > > void f(T, U) > > > > { > > > > @@ -32,5 +37,5 @@ void f(T, U) > > > > > > > > void g() > > > > { > > > > - f(0, 1.3); > > > > + f(0, 1.3); // { dg-message " required from here" } > > > > } > > > > diff --git a/gcc/testsuite/g++.dg/template/error60.C b/gcc/testsuite/g++.dg/template/error60.C > > > > new file mode 100644 > > > > index 00000000000..8c2139b207c > > > > --- /dev/null > > > > +++ b/gcc/testsuite/g++.dg/template/error60.C > > > > @@ -0,0 +1,37 @@ > > > > +// { dg-options "-fdiagnostics-show-caret" } > > > > + > > > > +template > > > > +struct my_pointer > > > > +{ > > > > + my_pointer (Foo *ptr) // { dg-message " initializing argument 1" } > > > > + : m_ptr (ptr) > > > > + {} > > > > + > > > > + Foo *m_ptr; > > > > +}; > > > > + > > > > +template > > > > +void test (Foo val) > > > > +{ > > > > + my_pointer ptr (val); // { dg-error "invalid conversion from 'int' to 'int\\*'" } > > > > +} > > > > + > > > > +void usage () > > > > +{ > > > > + test (42); // { dg-message " required from here" } > > > > + /* { dg-begin-multiline-output "" } > > > > + test (42); > > > > + ~~~~~~~~~~^~~~ > > > > + { dg-end-multiline-output "" } */ > > > > +} > > > > + > > > > + /* { dg-begin-multiline-output "" } > > > > + my_pointer (Foo *ptr) > > > > + ~~~~~^~~ > > > > + { dg-end-multiline-output "" } */ > > > > + /* { dg-begin-multiline-output "" } > > > > + my_pointer ptr (val); > > > > + ^~~ > > > > + | > > > > + int > > > > + { dg-end-multiline-output "" } */ > > > > -- > > > > 2.26.3 > > > > > > > > --8323329-306340493-1713986912=:3760645--