From patchwork Wed Jan 15 21:29:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 104856 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BC6CA3851408 for ; Wed, 15 Jan 2025 21:34:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC6CA3851408 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hy/4F7w1 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 ESMTP id 3DE863857C6D for ; Wed, 15 Jan 2025 21:29:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3DE863857C6D 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 3DE863857C6D 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=1736976584; cv=none; b=i5kxWFWkM6vNl5CHkzMD2i3N9xfjFYKH03cHofDzk5p8agXKlHZ0XfUe8dP9bP4DVJ6T1c+OqZNQkSjLqwD6UGEo/HT3VOr5dCNMkpmezUHa6j2Lqs7z5r7dVzBeu0H2/wqLF2u49ryIZKsRioUqQUdqPqYJ0hVFW5ebZXn/cQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736976584; c=relaxed/simple; bh=N18f/NFvlRmlzFY23kEQwWOhoOoXzD2WpkoBZfkCgQ4=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=o7tU0vsXFSMi8MxUccvwYk4MEQjOG6xBYzPXJzILWA9Sr8apj6tMFdHWA8WrQeKxEq3ZISOUGCTgcNtNy4HTBcHz7aBGWleHrs0B/NfDpSfE3i5r73JnNDK4vGYCtc6mqm8MtrQRhhB05dNs/WcH1MCf5zqrY1FuDCjULWzacFQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3DE863857C6D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736976584; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=RqKlUF0NTZxG5JrJwnj6XmUd4vmtbNKiAm6uuMi3hgs=; b=hy/4F7w1VpzS0pFo9fXDnCj24LyQeHvxOuMbrwOEFeJWrwR5Vk6+/UVauJ0EtlQPXJQsN6 13IaSfFb4UqjivIChDhNiFOill1dlNreDLIZPOX4Mys3hH/ju4rCaUA+cFlbM36wm+qlRZ xtq93+Eju8jE2oWO8eLhrp7itMLvcwc= Received: from mx-prod-mc-04.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-617-m5hIYcYROQOR8a6YefGGRg-1; Wed, 15 Jan 2025 16:29:40 -0500 X-MC-Unique: m5hIYcYROQOR8a6YefGGRg-1 X-Mimecast-MFC-AGG-ID: m5hIYcYROQOR8a6YefGGRg Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5FCD41955DCC; Wed, 15 Jan 2025 21:29:39 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.45.224.8]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 90AD5195608E; Wed, 15 Jan 2025 21:29:38 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 50FLTZeX335768 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 15 Jan 2025 22:29:35 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 50FLTYXc335766; Wed, 15 Jan 2025 22:29:34 +0100 Date: Wed, 15 Jan 2025 22:29:34 +0100 From: Jakub Jelinek To: Richard Biener Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] vec.h: Properly destruct elements in auto_vec auto storage [PR118400] Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7Q8YDdrSNV13wmUv9rP_XCt3PICR0JrzdkfdNjX8GuI_1736976579 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Hi! For T with non-trivial destructors, we were destructing objects in the vector on release only when not using auto storage of auto_vec. The following patch calls truncate (0) instead of m_vecpfx.m_num clearing, and truncate takes care of that destruction: unsigned l = length (); gcc_checking_assert (l >= size); if (!std::is_trivially_destructible ::value) vec_destruct (address () + size, l - size); m_vecpfx.m_num = size; Bootstrapped/regtested on x86_64-linux and i686-linux, plus tested on the testcase from the PR under valgrind, ok for trunk? 2025-01-15 Jakub Jelinek PR ipa/118400 * vec.h (vec::release): Call m_vec->truncate (0) instead of clearing m_vec->m_vecpfx.m_num. Jakub --- gcc/vec.h.jj 2025-01-15 08:43:16.259249515 +0100 +++ gcc/vec.h 2025-01-15 09:32:25.755433708 +0100 @@ -2020,7 +2020,7 @@ vec::release (void) if (using_auto_storage ()) { - m_vec->m_vecpfx.m_num = 0; + m_vec->truncate (0); return; }