From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 5BF593858425; Thu, 26 Jan 2023 13:38:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BF593858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674740316; bh=ndEuTxBJlwy/4vgNUmVYi53tFi8P1uzwXdvVs9hscuE=; h=From:To:Subject:Date:From; b=qcZgptJtEGmA0pErpyCkR28Ib/tGVNk3YCmx7SfvI4UWJV0k8/Aq9pY33b41IITbm T9mCu02OkkutENLl+1WAjFceG+5/MFRgxUacixngq0to5ww4vNfDH/rbSb5imLX4vu c90nVyqz17kAqc73NbtjXmTDAFLWFhV3oRvoxV3U= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5386] libstdc++: Add returns_nonnull to non-inline std::map detail [PR108554] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 93e2bf51dedd0870b78b770b72e34b15a7a0d14a X-Git-Newrev: 3376467ce090aa0966d59ca3aea35db4f17a4b47 Message-Id: <20230126133836.5BF593858425@sourceware.org> Date: Thu, 26 Jan 2023 13:38:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:3376467ce090aa0966d59ca3aea35db4f17a4b47 commit r13-5386-g3376467ce090aa0966d59ca3aea35db4f17a4b47 Author: Jonathan Wakely Date: Thu Jan 26 10:55:28 2023 +0000 libstdc++: Add returns_nonnull to non-inline std::map detail [PR108554] std::map uses a non-inline function to rebalance its tree and the compiler can't see that it always returns a valid pointer (assuming valid inputs, which is a precondition anyway). This can result in -Wnull-derefernce warnings for valid code, because the compiler thinks there is a path where the function returns null. Adding the returns_nonnull attribute tells the compiler that is can't happen. While we're doing that, we might as well also add a nonnull attribute to the rebalancing functions too. libstdc++-v3/ChangeLog: PR libstdc++/108554 * include/bits/stl_tree.h (_Rb_tree_insert_and_rebalance): Add nonnull attribute. (_Rb_tree_rebalance_for_erase): Add nonnull and returns_nonnull attributes. * testsuite/23_containers/map/modifiers/108554.cc: New test. Diff: --- libstdc++-v3/include/bits/stl_tree.h | 2 ++ .../testsuite/23_containers/map/modifiers/108554.cc | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 5b7a5869b14..3c331fbc952 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -405,12 +405,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Base_ptr _M_node; }; + __attribute__((__nonnull__)) void _Rb_tree_insert_and_rebalance(const bool __insert_left, _Rb_tree_node_base* __x, _Rb_tree_node_base* __p, _Rb_tree_node_base& __header) throw (); + __attribute__((__nonnull__,__returns_nonnull__)) _Rb_tree_node_base* _Rb_tree_rebalance_for_erase(_Rb_tree_node_base* const __z, _Rb_tree_node_base& __header) throw (); diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/108554.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/108554.cc new file mode 100644 index 00000000000..7076682f4c9 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/108554.cc @@ -0,0 +1,19 @@ +// { dg-do compile { target c++17 } } +// { dg-options "-Wnull-dereference -O2" } + +// PR libstdc++/108554 +// Warning from -Wnull-dereference when extracting a unique_ptr from a map. + +#include +#include +#include + +int pop(std::map>& m) +{ + if (auto it = m.find("key"); it != m.end()) + { + auto item = std::move(m.extract(it).mapped()); + return *item; + } + return 0; +}