aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuanghui Nie <nnnjkk@gmail.com>2024-01-22 06:45:48 +0100
committerFrançois Dumont <fdumont@gcc.gnu.org>2024-01-24 06:36:04 +0100
commitec0a68b9ee3e4b3de84816ea22c82214f8a8ceb0 (patch)
tree5d2c9e4d649a13233965ae0ddb4500b8933cfe74
parent7f7d9c525c694e36ae525ed93ccd5b6ffad0f1d8 (diff)
downloadgcc-ec0a68b9ee3e4b3de84816ea22c82214f8a8ceb0.zip
gcc-ec0a68b9ee3e4b3de84816ea22c82214f8a8ceb0.tar.gz
gcc-ec0a68b9ee3e4b3de84816ea22c82214f8a8ceb0.tar.bz2
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>
-rw-r--r--libstdc++-v3/include/bits/hashtable.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h
index b486100..c3ef7a0 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;
}
}