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 9387A3851153 for ; Fri, 24 Feb 2023 14:28:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9387A3851153 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677248896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xyJ1vAcfbpKyQY6fip3x6kKxhQYQPWMeaJkNwjhhztY=; b=LW+gJWcPSspGoSBP4jP/tNpI61407XYHQq7wg0KilyOg7cYqrFoLc5AgHF/wXSDgguiRWZ woCg2o4n+eyW5fapzb3hV/UUa8sOUpKFPiqvYku1Qh6QZ6Ysz9OvXUutLSZF1SwFYpNN7F LAKx+NXTBnNd4RLHWR/oRn7BtOdlLSo= 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) From: Jonathan Wakely 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 Content-Type: text/plain Content-Transfer-Encoding: 8bit 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=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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)) -- 2.39.2