From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 43F00384403C; Mon, 29 Mar 2021 20:04:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 43F00384403C 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 r10-9607] libstdc++: Add workaround for weird std::tuple error [PR 96592] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 916177b12639dad1613a99e068ccc062d20440cc X-Git-Newrev: 202e96058031b8ac2edc8fdab2faab06b988a253 Message-Id: <20210329200433.43F00384403C@sourceware.org> Date: Mon, 29 Mar 2021 20:04:33 +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: Mon, 29 Mar 2021 20:04:33 -0000 https://gcc.gnu.org/g:202e96058031b8ac2edc8fdab2faab06b988a253 commit r10-9607-g202e96058031b8ac2edc8fdab2faab06b988a253 Author: Jonathan Wakely Date: Thu Sep 3 16:26:16 2020 +0100 libstdc++: Add workaround for weird std::tuple error [PR 96592] This "fix" makes no sense, but it avoids an error from G++ about std::is_constructible being incomplete. The real problem is elsewhere, but this "fixes" the regression for now. libstdc++-v3/ChangeLog: PR libstdc++/96592 * include/std/tuple (_TupleConstraints): Use alternative is_constructible instead of std::is_constructible. * testsuite/20_util/tuple/cons/96592.cc: New test. (cherry picked from commit 032a4b42cc5f2105f622690ce2552f1c30e1d227) Diff: --- libstdc++-v3/include/std/tuple | 4 ++ libstdc++-v3/testsuite/20_util/tuple/cons/96592.cc | 58 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 94b9e0335b1..99121532101 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -460,6 +460,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct _TupleConstraints { + template // Workaround for PR 96592 + using is_constructible + = __bool_constant<__is_constructible(_Tp, _Up)>; + // Constraint for a non-explicit constructor. // True iff each Ti in _Types... can be constructed from Ui in _UTypes... // and every Ui is implicitly convertible to Ti. diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/96592.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/96592.cc new file mode 100644 index 00000000000..326ab0ef2a6 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/tuple/cons/96592.cc @@ -0,0 +1,58 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do compile { target c++11 } } + +#include + +// PR 96592 comment 0 + +template +struct SomeQuery { + SessionT& session_; + SomeQuery(SessionT& session) : session_(session) {} +}; + +template +struct Handler { + std::tuple> queries_; + Handler(SessionT& session) : queries_(session) {} +}; + +struct Session { + Handler handler_; + Session() : handler_{*this} {} +}; + +Session session; + +// PR 96592 comment 1 +template +class DependsOnT +{ +public: + DependsOnT(T&) {} +}; + +class Test +{ +public: + Test() : test_{*this} {} + +private: + std::tuple> test_; +};