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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 736B0398542D for ; Thu, 3 Sep 2020 15:38:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 736B0398542D Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-497-FQxCyfHcOkmZ7VYmo5omEQ-1; Thu, 03 Sep 2020 11:38:03 -0400 X-MC-Unique: FQxCyfHcOkmZ7VYmo5omEQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BEEC18B9F86; Thu, 3 Sep 2020 15:38:02 +0000 (UTC) Received: from localhost (unknown [10.33.36.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id A822D39A47; Thu, 3 Sep 2020 15:38:01 +0000 (UTC) Date: Thu, 3 Sep 2020 16:38:00 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add workaround for weird std::tuple error [PR 96592] Message-ID: <20200903153800.GA1950735@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="7JfCtLOvnd9MIVvH" Content-Disposition: inline X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 15:38:07 -0000 --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. Tested powerpc64le-linux. Committed to trunk. This needs to go on the gcc-10 branch too. --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 032a4b42cc5f2105f622690ce2552f1c30e1d227 Author: Jonathan Wakely Date: Thu Sep 3 16:26:16 2020 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. diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 1c22d4db788..06f56337ce4 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -539,6 +539,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_; +}; --7JfCtLOvnd9MIVvH--