From patchwork Fri Feb 24 14:28:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 61339 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp940146wrd; Fri, 24 Feb 2023 06:30:05 -0800 (PST) X-Google-Smtp-Source: AK7set/5WiUEAzjo75InqLIZpHMPlNybRI7r9RsTu1zVojwMMefe1V2+GVdA2sZMlFJGi3rBfBAY X-Received: by 2002:a05:6402:291:b0:4ad:7055:3908 with SMTP id l17-20020a056402029100b004ad70553908mr17110928edv.21.1677249004938; Fri, 24 Feb 2023 06:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677249004; cv=none; d=google.com; s=arc-20160816; b=rOa/dEr7z8VswR/+VrBlfPGhmoP/7usI7feYcJrChpoayd58JzHTZ3EqWg66IX/un+ lvDSndBVzs/xQCIXqmO9gNY3IkjaIpM2rhR2nUPlUPVLg6rju8OajP+FVGK7SjvmXWRq blxxcUGAW3cvkQc51K4czLOKdWL9OZ7lQ9y/QudC3WWUqYtWDR10s2bQv1cLaqB46d3w lGI5NHtv305N/zUHWazBrtKJuzGuhIhSGZM/gXea33scItDs/Rw7ay1oXYWbfdMA/ICo hBLCYYlx299CjzbDwFNQrz8s6MJ/yXQYttHWmZ84DTQPjo6wrlKvMjCWeQuniWsQG9Nu hFPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=xyJ1vAcfbpKyQY6fip3x6kKxhQYQPWMeaJkNwjhhztY=; b=owsDYKnsGw9Iy8X9bgVtrUyKDzxfagT4mX0GFn2ksVuy9G8JqUOXUw2u8LHtD3s2zy PeGnt+RLnc4isncGGPJx53ubWPtFZ3w7lp8ZTuKZWYLig3rgZt6uV6bTgmKWqfh2mqTp mAGMrGnhnSYjO2b2qoL+dFA38FimXe9K8RNf0X4lhuIexv3mV+hrw6UMvNBj5N+MVngS tIUTkDKNdErNE74NYBd5G6O02b9RUH+ixy7uOSwIOFoVD6GSlaK2HqDOhOHte9bFr28O 7Y6rcD91yuGqsqaEqoa737A1HrBPz/X4uixsCr3IPHVWPRu/tfz4LoPrzbHO9cyLVonl fGzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=b1LtHWVK; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id 19-20020a170906005300b008dbc41587a8si13863942ejg.730.2023.02.24.06.30.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 06:30:04 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=b1LtHWVK; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6C813384F4B7 for ; Fri, 24 Feb 2023 14:29:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C813384F4B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677248943; bh=xyJ1vAcfbpKyQY6fip3x6kKxhQYQPWMeaJkNwjhhztY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=b1LtHWVKyAw24BCdVjgzJVEol6X/kRYmpvITz9vjr/I8L07Sv983rIMaWs+Bv6wgX zPyaJI4ElozbUzo6/o94Z7eiPDQg1pL7FiW0XZ+N5qziQ8zvttcneuhohcxvXSFw1P CeG6qbB3E0a/tFLyuxlV90Rbg48/uLb8O/mPAA18= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 30B4C3857365 for ; Fri, 24 Feb 2023 14:28:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 30B4C3857365 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-577-jppRG5WkPYi64R702Ln7TA-1; Fri, 24 Feb 2023 09:28:13 -0500 X-MC-Unique: jppRG5WkPYi64R702Ln7TA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2BB618E0043; Fri, 24 Feb 2023 14:28:12 +0000 (UTC) Received: from localhost (unknown [10.33.36.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A5B22166B29; Fri, 24 Feb 2023 14:28:12 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 5/5] libstdc++: Constrain net::executor constructors Date: Fri, 24 Feb 2023 14:28:08 +0000 Message-Id: <20230224142808.714075-5-jwakely@redhat.com> In-Reply-To: <20230224142808.714075-1-jwakely@redhat.com> References: <20230224142808.714075-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 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-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758723052542487610?= X-GMAIL-MSGID: =?utf-8?q?1758723052542487610?= Tested x86_64-linux. Pushed to trunk. -- >8 -- The TS says the arguments to these constructors shall meet the Executor requirements, so it's undefined if they don't. Constraining on a subset of those requirements won't affect valid cases, but prevents the majority of invalid cases from trying to instantiate the constructor. This prevents the non-explicit executor(Executor) constructor being a candidate anywhere that a net::executor could be constructed e.g. comparing ip::tcp::v4() == ip::udp::v4() would try to convert both operands to executor using that constructor, then compare then using operator==(const executor&, const executor&). libstdc++-v3/ChangeLog: * include/experimental/executor (executor): Constrain template constructors. --- libstdc++-v3/include/experimental/executor | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/experimental/executor b/libstdc++-v3/include/experimental/executor index cd75d99ddb3..1dae8925916 100644 --- a/libstdc++-v3/include/experimental/executor +++ b/libstdc++-v3/include/experimental/executor @@ -1012,6 +1012,9 @@ inline namespace v1 class executor { + template + using _Context_t = decltype(std::declval<_Executor&>().context()); + public: // construct / copy / destroy: @@ -1021,12 +1024,14 @@ inline namespace v1 executor(const executor&) noexcept = default; executor(executor&&) noexcept = default; - template + template>>> executor(_Executor __e) : _M_target(make_shared<_Tgt1<_Executor>>(std::move(__e))) { } - template + template>>> executor(allocator_arg_t, const _ProtoAlloc& __a, _Executor __e) : _M_target(allocate_shared<_Tgt2<_Executor, _ProtoAlloc>>(__a, std::move(__e), __a))