From patchwork Fri Oct 4 09:53:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1992669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QgO2qlI6; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XKkT2615Cz1xt7 for ; Fri, 4 Oct 2024 19:56:06 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A8CFC386D609 for ; Fri, 4 Oct 2024 09:56:04 +0000 (GMT) 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.133.124]) by sourceware.org (Postfix) with ESMTP id 155B8385E45A for ; Fri, 4 Oct 2024 09:55:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 155B8385E45A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 155B8385E45A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728035712; cv=none; b=S3FHNeYc38xuYRzy6keaWPfGYPPrT4LIv7uYNYRetIyh10QyJYPU+1Vrn5wEzIEq0gZmsES65lw4Q7pVe6dmQ2PuqqZgH6SjS+CuGvSkOHTGDHOB7OnoM06Wi1SDAQbtATskOUhTisBzzZVDehY2x8pN7OHE0Wnasei6nE9gfs8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728035712; c=relaxed/simple; bh=21JBoCZlod4PorAyakxIrM0WmShxIE8QhCLiMDb7v/s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=VWD7I/Iu/bbiy27qwrsdN+8G92JGpPEel+eNDSBUhoi85MFVbb97d07gPnaIwW65T7y/49YenA9/G5OrXsNYWPtpke8l9tGRcFQHO6UkWasxpQJl+2BPDVszeg37EriwKbcswoS3Vj9Ox7/r7uQ9UJ4oNA5xANu2mznjeRQ+zy0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728035710; 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; bh=LQpyGqPebqsPp3+fnbGh1jtsUMhvhZNa371YC+D0MMY=; b=QgO2qlI6e1bhc3W6UJ08fxsnrYATSMz5a7XebzysHv8yFESpyVppac/tsywbYBrdjyS4qr 5R3xwdm9ju+ESbn0TVBEdiY3n2avc4tsMqLcOd889KObNzEACfyz/wZ1jaWO3b867hdLA9 I+dZoyOI2d2F3Za/a+5k6T8EgIbTmXk= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-JS5puVnxOUil4xMTXgGUeg-1; Fri, 04 Oct 2024 05:55:07 -0400 X-MC-Unique: JS5puVnxOUil4xMTXgGUeg-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 25EFF18F38E7; Fri, 4 Oct 2024 09:54:45 +0000 (UTC) Received: from localhost (unknown [10.42.28.136]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E5F5F1959168; Fri, 4 Oct 2024 09:54:40 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Replace implicit lambda capture of 'this' [PR116964] Date: Fri, 4 Oct 2024 10:53:46 +0100 Message-ID: <20241004095439.3827825-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 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_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-linux (and tested the affected code by manually bodging the _GLIBCXX_USE_PTHREAD_RWLOCK_T macro). Pushed to trunk. -- >8 -- C++20 deprecates implicit capture of 'this', so change [=] to [this] for all lambda expressions in . This only shows up on targets where _GLIBCXX_USE_PTHREAD_RWLOCK_T is not defined, as we have an alternative implementation of shared mutexes in that case. libstdc++-v3/ChangeLog: PR libstdc++/116964 * include/std/shared_mutex (__shared_mutex_cv): Use [this] for lambda captures. (shared_timed_mutex) [!_GLIBCXX_USE_PTHREAD_RWLOCK_T]: Likewise. --- libstdc++-v3/include/std/shared_mutex | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex index 9bf98c0b040..b369a15cc60 100644 --- a/libstdc++-v3/include/std/shared_mutex +++ b/libstdc++-v3/include/std/shared_mutex @@ -332,10 +332,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { unique_lock __lk(_M_mut); // Wait until we can set the write-entered flag. - _M_gate1.wait(__lk, [=]{ return !_M_write_entered(); }); + _M_gate1.wait(__lk, [this]{ return !_M_write_entered(); }); _M_state |= _S_write_entered; // Then wait until there are no more readers. - _M_gate2.wait(__lk, [=]{ return _M_readers() == 0; }); + _M_gate2.wait(__lk, [this]{ return _M_readers() == 0; }); } bool @@ -367,7 +367,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION lock_shared() { unique_lock __lk(_M_mut); - _M_gate1.wait(__lk, [=]{ return _M_state < _S_max_readers; }); + _M_gate1.wait(__lk, [this]{ return _M_state < _S_max_readers; }); ++_M_state; } @@ -690,13 +690,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { unique_lock __lk(_M_mut); if (!_M_gate1.wait_until(__lk, __abs_time, - [=]{ return !_M_write_entered(); })) + [this]{ return !_M_write_entered(); })) { return false; } _M_state |= _S_write_entered; if (!_M_gate2.wait_until(__lk, __abs_time, - [=]{ return _M_readers() == 0; })) + [this]{ return _M_readers() == 0; })) { _M_state ^= _S_write_entered; // Wake all threads blocked while the write-entered flag was set. @@ -716,7 +716,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { unique_lock __lk(_M_mut); if (!_M_gate1.wait_until(__lk, __abs_time, - [=]{ return _M_state < _S_max_readers; })) + [this]{ return _M_state < _S_max_readers; })) { return false; }