From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id EB6B13848407; Fri, 16 Jul 2021 22:05:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EB6B13848407 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-2379] libstdc++: Improve diagnostics for std::get with invalid tuple index X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: a8b3861496bffae8b813ea196c1c5b27f79fbe69 X-Git-Newrev: 3dbc7b809a62167b36f217ab5f43207be19e5908 Message-Id: <20210716220529.EB6B13848407@sourceware.org> Date: Fri, 16 Jul 2021 22:05:29 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2021 22:05:30 -0000 https://gcc.gnu.org/g:3dbc7b809a62167b36f217ab5f43207be19e5908 commit r12-2379-g3dbc7b809a62167b36f217ab5f43207be19e5908 Author: Jonathan Wakely Date: Fri Jul 16 20:59:43 2021 +0100 libstdc++: Improve diagnostics for std::get with invalid tuple index This adds a deleted overload of std::get(const tuple&). Invalid calls with an out of range index will match the deleted overload and give a single, clear error about calling a deleted function, instead of overload resolution errors for every std::get overload in the library. This changes the current output of 15+ errors (plus notes and associated header context) into just two errors (plus context): error: static assertion failed: tuple index must be in range error: use of deleted function 'constexpr std::__enable_if_t<(__i >= sizeof... (_Types))> std::get(const std::tuple<_Types ...>&) [with long unsigned int __i = 1; _Elements = {int}; std::__enable_if_t<(__i >= sizeof... (_Types))> = void]' This seems like a nice improvement, although PR c++/66968 means that "_Types" is printed in the signature rather than "_Elements". Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/std/tuple (get): Add deleted overload for bad index. * testsuite/20_util/tuple/element_access/get_neg.cc: Adjust expected errors. Diff: --- libstdc++-v3/include/std/tuple | 7 ++++ .../20_util/tuple/element_access/get_neg.cc | 41 ++++++++++------------ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 6953f8715d7..8ee0d2f1ef5 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -1406,6 +1406,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return std::forward(std::__get_helper<__i>(__t)); } + /// @cond undocumented + // Deleted overload chosen for invalid indices. + template + constexpr __enable_if_t<(__i >= sizeof...(_Elements))> + get(const tuple<_Elements...>&) = delete; + /// @endcond + #if __cplusplus >= 201402L #define __cpp_lib_tuples_by_type 201304 diff --git a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc index cd850fdc21b..225bb6245a6 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc @@ -25,12 +25,12 @@ test01() { using test_type = std::tuple<>; test_type t; - std::get<0>(t); // { dg-error "no match" } - std::get<0>(const_cast(t)); // { dg-error "no match" } - std::get<0>(static_cast(t)); // { dg-error "no match" } - std::get<5>(t); // { dg-error "no match" } - std::get<5>(const_cast(t)); // { dg-error "no match" } - std::get<5>(static_cast(t)); // { dg-error "no match" } + std::get<0>(t); // { dg-error "deleted" } + std::get<0>(const_cast(t)); // { dg-error "deleted" } + std::get<0>(static_cast(t)); // { dg-error "deleted" } + std::get<5>(t); // { dg-error "deleted" } + std::get<5>(const_cast(t)); // { dg-error "deleted" } + std::get<5>(static_cast(t)); // { dg-error "deleted" } } void @@ -38,12 +38,12 @@ test02() { using test_type = std::tuple; test_type t; - std::get<1>(t); // { dg-error "no match" } - std::get<1>(const_cast(t)); // { dg-error "no match" } - std::get<1>(static_cast(t)); // { dg-error "no match" } - std::get<5>(t); // { dg-error "no match" } - std::get<5>(const_cast(t)); // { dg-error "no match" } - std::get<5>(static_cast(t)); // { dg-error "no match" } + std::get<1>(t); // { dg-error "deleted" } + std::get<1>(const_cast(t)); // { dg-error "deleted" } + std::get<1>(static_cast(t)); // { dg-error "deleted" } + std::get<5>(t); // { dg-error "deleted" } + std::get<5>(const_cast(t)); // { dg-error "deleted" } + std::get<5>(static_cast(t)); // { dg-error "deleted" } } void @@ -51,15 +51,12 @@ test03() { using test_type = std::tuple; test_type t; - std::get<5>(t); // { dg-error "no match" } - std::get<5>(const_cast(t)); // { dg-error "no match" } - std::get<5>(static_cast(t)); // { dg-error "no match" } - std::get<6>(t); // { dg-error "no match" } - std::get<6>(const_cast(t)); // { dg-error "no match" } - std::get<6>(static_cast(t)); // { dg-error "no match" } + std::get<5>(t); // { dg-error "deleted" } + std::get<5>(const_cast(t)); // { dg-error "deleted" } + std::get<5>(static_cast(t)); // { dg-error "deleted" } + std::get<6>(t); // { dg-error "deleted" } + std::get<6>(const_cast(t)); // { dg-error "deleted" } + std::get<6>(static_cast(t)); // { dg-error "deleted" } } -// { dg-prune-output "tuple index must be in range" } -// { dg-prune-output "no type named .type" } -// { dg-prune-output "type/value mismatch" } -// { dg-prune-output "use of deleted function" } +// { dg-error "tuple index must be in range" "" { target *-*-* } 0 }