diff options
| -rw-r--r-- | libstdc++-v3/include/bits/stl_tree.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/map/modifiers/108554.cc | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index 5b7a586..3c331fb 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 0000000..7076682 --- /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 <map> +#include <memory> +#include <string> + +int pop(std::map<std::string, std::unique_ptr<int>>& m) +{ + if (auto it = m.find("key"); it != m.end()) + { + auto item = std::move(m.extract(it).mapped()); + return *item; + } + return 0; +} |