From patchwork Wed Nov 8 20:00:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Patchwork-Id: 1861757 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=T1+OoBjS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4SQbY64Y8vz1yQl for ; Thu, 9 Nov 2023 07:00:25 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 36BA4385624C for ; Wed, 8 Nov 2023 20:00:23 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by sourceware.org (Postfix) with ESMTPS id 18089385840A; Wed, 8 Nov 2023 20:00:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 18089385840A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 18089385840A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::229 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699473612; cv=none; b=CqIMnt9/s4FmkeVjEsW63hc5wirasTUkLHTe/RQ71c4+2eaQC9AoQ8NoJOctsN8Z0iyfctFpOyYhBP4yDHV7jBmY/S+r0DSI0XdYPRLDerruJHFsVNp8kVzn/d/sIvIU5XhvDDPFJe8WVzSKLQOHZSMiPwa2QOtakh+13MTQpEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699473612; c=relaxed/simple; bh=KxIBkpGJsXTphPUsYQy6irfLpkYjgpwIn2QCA+W2q88=; h=DKIM-Signature:Message-ID:Date:MIME-Version:From:Subject:To; b=URfTVrZe4dqic+1KcAFj4m0RZxI1qbjBFbkyJ49yYk94/QgmTPs1eggXBOtZMVV6N8curo3kwhA8l6HoRwYXLuxgbaFdd8et8H1RlU9krBFbuxJaZj0fPcirxNbVXqBL8aDX247ARofrjOYo+L+tA42xUMzuGJhBoKckoIWWUB4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2c7369df9d6so367851fa.1; Wed, 08 Nov 2023 12:00:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699473606; x=1700078406; darn=gcc.gnu.org; h=content-language:cc:to:subject:from:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=K+x/ig+lPigQTru9itH5qWTZ/mAbDDuvy56DdWyJBqs=; b=T1+OoBjSO8ixUKO0GSdKnnqb08wH+i3L1g01E9HB2Jt2j3WdyB53aEDGwlP/8X4nyf GcykSruuPEUqwdWt5B/FGID+H+J04UurG3Qsr3wdEJ3UnRcZxKbgjxXWlitrH8KRzmCs 14TV5yB5BKIRN/cCbHVgML0eNGn6j+jXuPNkNTiCzV+Y6pCiFRyBpSz0nXk+nzS47iWr D4NHrF8VE7VxKFqeN3Vjvm9iav/vwHhuED+/R/aaZOJVR0fC1erJZm6N4P0LHqjz2f7G xYJowj4C7Yb6vXYFdPXpQVWOO20VHyCEhH/o1ZiU19KVQ87Akbb7HEsvmwHRfz+uCG2k mS5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699473606; x=1700078406; h=content-language:cc:to:subject:from:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=K+x/ig+lPigQTru9itH5qWTZ/mAbDDuvy56DdWyJBqs=; b=A/rYljmm+2zbNF+t141XIF1T5CzlHVIRztfR2lK91aTvzgXPdXR60AUHZCo6Kuw7vZ MtHWFtn0uGCRAtzOxWOxnTm+Y84LEvi9HjHWD9KxoprfLQCETSyTw/vzJjseLVenwoeh zYSaWO0Hz3/+CsW5Q9bWwACXyJ+yQOcgQsIaRrRwbUH2PpLMrV1rBRt5sxhvBFI6H3wO MSofUuf3DbBhZuYGT38UvPGil8CX3po0KgpD2fMZ0lCScrp8rPVnnieBQXJHD2632jcX gf2o+Zpi23io+zY4kbddhzjHeIpZoGAPe/iDMIV8qqa+HcdcL+O2Q4ly/oskkVE2ygy6 dSOA== X-Gm-Message-State: AOJu0YwyQvjNMKhqOMsFyNiJV62zpYVNmKlXQzdUpRSybwdd3O3pj9Hw aUH7KErV7aelAYxeb3xsq/yl15oP3uQ= X-Google-Smtp-Source: AGHT+IGcZ2YNylA7sx6No2qJm7pFkj+s/AJ7ILnU/d8221Ogk0I0sJq0nOLCnGNT5MNRvDgqtVf3ow== X-Received: by 2002:a05:651c:3ca:b0:2c6:f625:cc61 with SMTP id f10-20020a05651c03ca00b002c6f625cc61mr2391124ljp.31.1699473605535; Wed, 08 Nov 2023 12:00:05 -0800 (PST) Received: from ?IPV6:2a01:e0a:1dc:b1c0:50d7:d658:1304:a1c7? ([2a01:e0a:1dc:b1c0:50d7:d658:1304:a1c7]) by smtp.gmail.com with ESMTPSA id k8-20020a05600c1c8800b004081a011c0esm20356033wms.12.2023.11.08.12.00.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Nov 2023 12:00:04 -0800 (PST) Message-ID: Date: Wed, 8 Nov 2023 21:00:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: =?utf-8?q?Fran=C3=A7ois_Dumont?= Subject: [PATCH][_Hahstable] Use RAII to guard node pointer while constructing To: libstdc++ Cc: gcc-patches Content-Language: en-US X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Another proposal to use RAII rather than __try/__catch block. libstdc++: [_Hashtable] Use RAII type to guard node while constructing value libstdc++-v3/ChangeLog:         * include/bits/hashtable_policy.h         (struct _NodePtrGuard<_HashtableAlloc, _NodePtr>): New.         (_ReuseAllocNode::operator()(_Args&&...)): Use latter to guard allocated node         pointer while constructing in place the value_type instance. Tested under Linux x64, ok to commit ? François diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index cd8943d8d05..c67eebd3b2b 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -173,6 +173,19 @@ namespace __detail { return __node_gen(std::forward<_Kt>(__k)); } }; + template + struct _NodePtrGuard + { + _HashtableAlloc& _M_h; + _NodePtr _M_ptr; + + ~_NodePtrGuard() + { + if (_M_ptr) + _M_h._M_deallocate_node_ptr(_M_ptr); + } + }; + template struct _Hashtable_alloc; @@ -201,27 +214,20 @@ namespace __detail __node_ptr operator()(_Args&&... __args) const { - if (_M_nodes) - { + if (!_M_nodes) + return _M_h._M_allocate_node(std::forward<_Args>(__args)...); + __node_ptr __node = _M_nodes; _M_nodes = _M_nodes->_M_next(); __node->_M_nxt = nullptr; auto& __a = _M_h._M_node_allocator(); __node_alloc_traits::destroy(__a, __node->_M_valptr()); - __try - { + _NodePtrGuard<__hashtable_alloc, __node_ptr> __guard { _M_h, __node }; __node_alloc_traits::construct(__a, __node->_M_valptr(), std::forward<_Args>(__args)...); - } - __catch(...) - { - _M_h._M_deallocate_node_ptr(__node); - __throw_exception_again; - } + __guard._M_ptr = nullptr; return __node; } - return _M_h._M_allocate_node(std::forward<_Args>(__args)...); - } private: mutable __node_ptr _M_nodes;