[gcc r14-8380] libstdc++: [_Hashtable] Remove useless check for _M_before_begin node
Francois Dumont
fdumont@gcc.gnu.org
Wed Jan 24 05:37:04 GMT 2024
https://gcc.gnu.org/g:ec0a68b9ee3e4b3de84816ea22c82214f8a8ceb0
commit r14-8380-gec0a68b9ee3e4b3de84816ea22c82214f8a8ceb0
Author: Huanghui Nie <nnnjkk@gmail.com>
Date: Mon Jan 22 06:45:48 2024 +0100
libstdc++: [_Hashtable] Remove useless check for _M_before_begin node
When removing the first node of a bucket it is useless to check if this bucket
is the one containing the _M_before_begin node. The bucket before-begin node is
already transfered to the next pointed-to bucket regardeless if it is the container
before-begin node.
libstdc++-v3/ChangeLog:
* include/bits/hashtable.h (_Hahstable<>::_M_remove_bucket_begin): Remove
_M_before_begin check and cleanup implementation.
Co-authored-by: Théo Papadopoulo <papadopoulo@gmail.com>
Diff:
---
libstdc++-v3/include/bits/hashtable.h | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h
index b48610036fa..c3ef7a0a3d5 100644
--- a/libstdc++-v3/include/bits/hashtable.h
+++ b/libstdc++-v3/include/bits/hashtable.h
@@ -869,16 +869,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_remove_bucket_begin(size_type __bkt, __node_ptr __next_n,
size_type __next_bkt)
{
- if (!__next_n || __next_bkt != __bkt)
+ if (!__next_n)
+ _M_buckets[__bkt] = nullptr;
+ else if (__next_bkt != __bkt)
{
- // Bucket is now empty
- // First update next bucket if any
- if (__next_n)
- _M_buckets[__next_bkt] = _M_buckets[__bkt];
-
- // Second update before begin node if necessary
- if (&_M_before_begin == _M_buckets[__bkt])
- _M_before_begin._M_nxt = __next_n;
+ _M_buckets[__next_bkt] = _M_buckets[__bkt];
_M_buckets[__bkt] = nullptr;
}
}
More information about the Libstdc++-cvs
mailing list