From patchwork Wed Nov 15 11:30:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 165343 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2521520vqg; Wed, 15 Nov 2023 05:05:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFlEiDID6Aw4dKJE+lddR1Tvfl1U73/6wvx7cv+qe9swTkGZGxq+N5vGh9QPEI1l68E+uuq X-Received: by 2002:ac8:58ca:0:b0:418:110e:6179 with SMTP id u10-20020ac858ca000000b00418110e6179mr5500639qta.1.1700053555707; Wed, 15 Nov 2023 05:05:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700053555; cv=pass; d=google.com; s=arc-20160816; b=RyzYg+upwOnvznDwhkfz9ne9cVGWAKC3hvtOj+/vHk8W7XO6CZuelATsZbJB2iuczK vbaWJKiJnPE88lEXvwgj7eK6LiLmE/VWtZr+xV4JIqmKGX4VIZ4WN/ehj8sb+iWdYvoM JFMSxDcFtYQHk/ptJnwFyVoMBivgo/AZp0gG4LBLCxjt/OxLV41418kffaOpv0Wgfslr MIxPqz8YsshMgYWIkpX+714jyRIJ2orACjHZ+NboLiApqFsEMWEvcnGvD3IFshQIJWfq qaOqAM0qKzJDEOmSjo2UQsy9dcomvRyPj+vYlylQFEmnVpNdhO4H/dJx9ByfHf0wjsyb ohLw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=LX/XNoAiOoEil0YvzqovAJEr/3d7fPbjkR164CsaFjY=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=jOD+XaNjfiowaLimpA7UauyPG/huUIHtDBQD1iq07b/TOhEmeyc1zJGcx9UZs0KeQe BvweMwC93U1nsW9Uscov+5i8esqvTEI4D+MEyGzVMaBo03FBP8+bKJcJKblJKB/2Er8Z MQ3JciejSFk5JASnzpaDv+8Z9Uhm+i2ubS1XAyvBTAqPBu/5HjKcKVu5a7H4IzhZe6Vi EllhOliWPP2VLO4ezZAb47JGXeIStH3kEzVYc/Vdk7r8JZHof/a0Dww1yI278B1/o567 PAPQ7l5U5yZDsbbVtphz74SSW0110LdvxReeMvC+IrjTmU65Jcl48QBEPNfc3ZyH1X1Y nBpg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=K4QCDhXi; arc=pass (i=1); 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=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o11-20020a05622a044b00b00417cfd588d1si9199511qtx.255.2023.11.15.05.05.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 05:05:55 -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=@redhat.com header.s=mimecast20190719 header.b=K4QCDhXi; arc=pass (i=1); 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=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 268AA38582A8 for ; Wed, 15 Nov 2023 11:30:53 +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.129.124]) by sourceware.org (Postfix) with ESMTPS id A56CE3858C20 for ; Wed, 15 Nov 2023 11:30:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A56CE3858C20 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 A56CE3858C20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700047829; cv=none; b=NOZE0PfNIPDLvOm9md/MGJa+c1l3wNW2RlftCE2qZgQQ7oQ6M9NKb6ynEG+6VX4JlPSVreu7WxPk/DY4F3HS5E4j3tES5NWauzPZJZur477yayWEI+AUHcWDcwXk4nDZdDY0yDRXrK6pX1HSUNmcqCKE8cIooCzFA+viN0IAIP4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700047829; c=relaxed/simple; bh=iRuicn51mHnRCwdr4DOmYlpJMd3AXsUhjCH8wOsoETo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KglzmIWQ9glaP0X7wo2jE1gln8Cs/eRtq++kJiDXw8vLQ0Ga41YlHujToqM2XrhTLiHbWZun+zm+Gk4fUQTKwqR8zc1rDQsDDqRRLh2h2/8h6xqMGSSDoT2V+fE2u6cL9EP51+1dRCoBhQTdgFubtmPR+F6I7Q6qJ/bcjYzn8jg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700047822; 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=LX/XNoAiOoEil0YvzqovAJEr/3d7fPbjkR164CsaFjY=; b=K4QCDhXiBuzlUE/IkzRc9DLFbgmMRQxDbNSBI5TuS3BdBJ29vvjL2zoiCc9g31fCAuYthh mG/+z/J0uMPCVll7PkSHscJATW9mPnCpFfZgCWq7dkb1GILmhponIBX1nbOr9JMyXTiqsI X0aME6/oq1gQHtMFP8/FbKtn3Gk33lQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-621-JkupasWzP9SDxVYRwCtkoQ-1; Wed, 15 Nov 2023 06:30:20 -0500 X-MC-Unique: JkupasWzP9SDxVYRwCtkoQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 89717811E8F; Wed, 15 Nov 2023 11:30:20 +0000 (UTC) Received: from localhost (unknown [10.42.28.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 292852166B27; Wed, 15 Nov 2023 11:30:20 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix std::deque::operator[] Xmethod [PR112491] Date: Wed, 15 Nov 2023 11:30:03 +0000 Message-ID: <20231115113019.1048370-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782635357214515996 X-GMAIL-MSGID: 1782635357214515996 Tested x86_64-linux. Pushed to trunk. Backports to follow. -- >8 -- The Xmethod for std::deque::operator[] has the same bug that I recently fixed for the std::deque::size() Xmethod. The first node might have unused capacity at the start, which needs to be accounted for when indexing into the deque. libstdc++-v3/ChangeLog: PR libstdc++/112491 * python/libstdcxx/v6/xmethods.py (DequeWorkerBase.index): Correctly handle unused capacity at the start of the first node. * testsuite/libstdc++-xmethods/deque.cc: Check index operator when elements have been removed from the front. --- libstdc++-v3/python/libstdcxx/v6/xmethods.py | 12 ++++++++---- libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc | 6 +++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py index dcef285180a..f29bc2d40fb 100644 --- a/libstdc++-v3/python/libstdcxx/v6/xmethods.py +++ b/libstdc++-v3/python/libstdcxx/v6/xmethods.py @@ -195,7 +195,7 @@ class DequeWorkerBase(gdb.xmethod.XMethodWorker): def size(self, obj): start = obj['_M_impl']['_M_start'] finish = obj['_M_impl']['_M_finish'] - if not start['_M_node']: + if start['_M_cur'] == finish['_M_cur']: return 0 return (self._bufsize * (finish['_M_node'] - start['_M_node'] - 1) @@ -203,9 +203,13 @@ class DequeWorkerBase(gdb.xmethod.XMethodWorker): + (start['_M_last'] - start['_M_cur'])) def index(self, obj, idx): - first_node = obj['_M_impl']['_M_start']['_M_node'] - index_node = first_node + int(idx) // self._bufsize - return index_node[0][idx % self._bufsize] + start = obj['_M_impl']['_M_start'] + first_node_size = start['_M_last'] - start['_M_cur'] + if idx < first_node_size: + return start['_M_cur'][idx] + idx = idx - first_node_size + index_node = start['_M_node'][1 + int(idx) // self._bufsize] + return index_node[idx % self._bufsize] class DequeEmptyWorker(DequeWorkerBase): diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc b/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc index e4077c14ff5..6058d23c87a 100644 --- a/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc @@ -69,20 +69,24 @@ main () // PR libstdc++/112491 std::deque q5; - q5.push_front(0); + q5.push_front(5); // { dg-final { note-test q5.size() 1 } } +// { dg-final { note-test q5\[0\] 5 } } std::deque q6 = q1; q6.pop_front(); // { dg-final { note-test {q6.size() == (q1_size-1)} true } } +// { dg-final { note-test q6\[1\] 102 } } std::deque q7 = q2; q7.pop_front(); q7.pop_front(); // { dg-final { note-test {q7.size() == (q2_size-2)} true } } +// { dg-final { note-test q7\[1\] 203 } } std::deque q8 = q3; q8.pop_front(); q8.pop_front(); q8.pop_front(); // { dg-final { note-test {q8.size() == (q3_size-3)} true } } +// { dg-final { note-test q8\[1\] 304 } } std::deque q9 = q8; q9.clear(); // { dg-final { note-test q9.size() 0 } }