From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id 488FB3858D37; Fri, 22 Mar 2024 22:51:21 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 488FB3858D37
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1711147881;
	bh=zYmpk0n/lzWa7uW3WP2+7nE0kyCibu1zaMybtSxsflQ=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=gYGtsRjGCA96KNboTADgna0mT84FGQvo6bTIR6WAMYmbg8CWMf5nZllw4CjgvxRLS
	 WItR4SBfl0FLaeTB//a7OC8eLSYJeOTpsat/KriH+SUdONReOzxzIekpEjBA25uQ0w
	 VvPltk1I7PZevuUbhmXqVJsaRr77dCK5HuQ2abOU=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug libstdc++/114401] libstdc++ allocator destructor omitted when
 reinserting node_handle into tree- and hashtable-based containers
Date: Fri, 22 Mar 2024 22:51:20 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: libstdc++
X-Bugzilla-Version: 14.0
X-Bugzilla-Keywords: wrong-code
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: ASSIGNED
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: redi at gcc dot gnu.org
X-Bugzilla-Target-Milestone: 11.5
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-114401-4-oireGo1rUK@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-114401-4@http.gcc.gnu.org/bugzilla/>
References: <bug-114401-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D114401

--- Comment #3 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jonathan Wakely <redi@gcc.gnu.org>:

https://gcc.gnu.org/g:c2e28df90a1640cebadef6c6c8ab5ea964071bb1

commit r14-9636-gc2e28df90a1640cebadef6c6c8ab5ea964071bb1
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Mar 21 13:25:15 2024 +0000

    libstdc++: Destroy allocators in re-inserted container nodes [PR114401]

    The allocator objects in container node handles were not being destroyed
    after the node was re-inserted into a container. They are stored in a
    union and so need to be explicitly destroyed when the node becomes
    empty. The containers were zeroing the node handle's pointer, which
    makes it empty, causing the handle's destructor to think there's nothign
    to clean up.

    Add a new member function to the node handle which destroys the
    allocator and zeros the pointer. Change the containers to call that
    instead of just changing the pointer manually.

    We can also remove the _M_empty member of the union which is not
    necessary.

    libstdc++-v3/ChangeLog:

            PR libstdc++/114401
            * include/bits/hashtable.h (_Hashtable::_M_reinsert_node): Call
            release() on node handle instead of just zeroing its pointer.
            (_Hashtable::_M_reinsert_node_multi): Likewise.
            (_Hashtable::_M_merge_unique): Likewise.
            (_Hashtable::_M_merge_multi): Likewise.
            * include/bits/node_handle.h (_Node_handle_common::release()):
            New member function.
            (_Node_handle_common::_Optional_alloc::_M_empty): Remove
            unnecessary union member.
            (_Node_handle_common): Declare _Hashtable as a friend.
            * include/bits/stl_tree.h (_Rb_tree::_M_reinsert_node_unique):
            Call release() on node handle instead of just zeroing its
            pointer.
            (_Rb_tree::_M_reinsert_node_equal): Likewise.
            (_Rb_tree::_M_reinsert_node_hint_unique): Likewise.
            (_Rb_tree::_M_reinsert_node_hint_equal): Likewise.
            * testsuite/23_containers/multiset/modifiers/114401.cc: New tes=
t.
            * testsuite/23_containers/set/modifiers/114401.cc: New test.
            * testsuite/23_containers/unordered_multiset/modifiers/114401.c=
c:
New test.
            * testsuite/23_containers/unordered_set/modifiers/114401.cc: New
test.=