]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Initialize all members of hashtable local iterators
authorJonathan Wakely <jwakely@redhat.com>
Thu, 12 Dec 2024 20:42:19 +0000 (20:42 +0000)
committerJonathan Wakely <redi@gcc.gnu.org>
Mon, 16 Dec 2024 14:05:10 +0000 (14:05 +0000)
Currently the _M_bucket members are left uninitialized for
default-initialized local iterators, and then copy construction copies
indeterminate values. We should just ensure they're initialized on
construction.

Setting them to zero makes default-initialization consistent with
value-initialization and avoids indeterminate values.

For the _Local_iterator_base<..., false> specialization we preserve the
existing behaviour of setting _M_bucket_count to -1 in the default
constructor, as a sentinel value to indicate there's no hash object
present.

libstdc++-v3/ChangeLog:

* include/bits/hashtable_policy.h (_Local_iterator_base): Use
default member-initializers.

libstdc++-v3/include/bits/hashtable_policy.h

index b7788eb5bd78dd10ebda231850102ae748c46efc..6f46a5796ba3c86e21820a2727bd7ebd0da32730 100644 (file)
@@ -1156,8 +1156,8 @@ namespace __detail
          }
       }
 
-      size_t _M_bucket;
-      size_t _M_bucket_count;
+      size_t _M_bucket = 0;
+      size_t _M_bucket_count = 0;
 
     public:
       size_t
@@ -1194,7 +1194,7 @@ namespace __detail
       using __hash_obj_storage = _Hash_obj_storage<_Hash>;
       using __node_iter_base = _Node_iterator_base<_Value, false>;
 
-      _Local_iterator_base() : _M_bucket_count(-1) { }
+      _Local_iterator_base() = default;
 
       _Local_iterator_base(const __hash_code_base& __base,
                           _Hash_node<_Value, false>* __p,
@@ -1242,8 +1242,8 @@ namespace __detail
          }
       }
 
-      size_t _M_bucket;
-      size_t _M_bucket_count;
+      size_t _M_bucket = 0;
+      size_t _M_bucket_count = -1;
 
       void
       _M_init(const _Hash& __h)