Skip to content

Commit dd40c46

Browse files
winner245winner245
authored
[libc++] Clean up casts in std::forward_list (#130310)
The patch removes unnecessary casts to `void*` pointers, inline some casts, and eliminates an identity cast.
1 parent 2a41350 commit dd40c46

File tree

1 file changed

+39
-58
lines changed

1 file changed

+39
-58
lines changed

‎libcxx/include/forward_list‎

Lines changed: 39 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ struct __forward_node_traits {
282282
typedef _NodePtr __node_pointer;
283283
typedef __forward_begin_node<_NodePtr> __begin_node;
284284
typedef __rebind_pointer_t<_NodePtr, __begin_node> __begin_node_pointer;
285-
typedef __rebind_pointer_t<_NodePtr, void> __void_pointer;
286285

287286
// TODO(LLVM 22): Remove this check
288287
# ifndef _LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB
@@ -294,10 +293,6 @@ struct __forward_node_traits {
294293
"is being broken between LLVM 19 and LLVM 20. If you don't care about your ABI being broken, define "
295294
"the _LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB macro to silence this diagnostic.");
296295
# endif
297-
298-
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI static __begin_node_pointer __as_iter_node(__node_pointer __p) {
299-
return std::__static_fancy_pointer_cast<__begin_node_pointer>(__p);
300-
}
301296
};
302297

303298
template <class _NodePtr>
@@ -309,10 +304,6 @@ struct __forward_begin_node {
309304

310305
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_begin_node() : __next_(nullptr) {}
311306
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_begin_node(pointer __n) : __next_(__n) {}
312-
313-
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __begin_node_pointer __next_as_begin() const {
314-
return std::__static_fancy_pointer_cast<__begin_node_pointer>(__next_);
315-
}
316307
};
317308

318309
template <class _Tp, class _VoidPtr>
@@ -361,23 +352,17 @@ class __forward_list_iterator {
361352
typedef typename __traits::__begin_node __begin_node_type;
362353
typedef typename __traits::__node_pointer __node_pointer;
363354
typedef typename __traits::__begin_node_pointer __begin_node_pointer;
364-
typedef typename __traits::__void_pointer __void_pointer;
365355

366356
__begin_node_pointer __ptr_;
367357

368-
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __begin_node_pointer __get_begin() const { return __ptr_; }
369-
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __node_pointer __get_unsafe_node_pointer() const {
370-
return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_);
371-
}
372-
373358
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_list_iterator(nullptr_t) _NOEXCEPT
374359
: __ptr_(nullptr) {}
375360

376361
_LIBCPP_CONSTEXPR_SINCE_CXX26
377362
_LIBCPP_HIDE_FROM_ABI explicit __forward_list_iterator(__begin_node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
378363

379364
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_list_iterator(__node_pointer __p) _NOEXCEPT
380-
: __ptr_(__traits::__as_iter_node(__p)) {}
365+
: __ptr_(std::__static_fancy_pointer_cast<__begin_node_pointer>(__p)) {}
381366

382367
template <class, class>
383368
friend class forward_list;
@@ -394,14 +379,14 @@ public:
394379
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_iterator() _NOEXCEPT : __ptr_(nullptr) {}
395380

396381
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI reference operator*() const {
397-
return __get_unsafe_node_pointer()->__get_value();
382+
return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_)->__get_value();
398383
}
399384
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI pointer operator->() const {
400-
return pointer_traits<pointer>::pointer_to(__get_unsafe_node_pointer()->__get_value());
385+
return pointer_traits<pointer>::pointer_to(std::__static_fancy_pointer_cast<__node_pointer>(__ptr_)->__get_value());
401386
}
402387

403388
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_iterator& operator++() {
404-
__ptr_ = __traits::__as_iter_node(__ptr_->__next_);
389+
__ptr_ = std::__static_fancy_pointer_cast<__begin_node_pointer>(__ptr_->__next_);
405390
return *this;
406391
}
407392
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_iterator operator++(int) {
@@ -430,15 +415,9 @@ class __forward_list_const_iterator {
430415
typedef typename __traits::__begin_node __begin_node_type;
431416
typedef typename __traits::__node_pointer __node_pointer;
432417
typedef typename __traits::__begin_node_pointer __begin_node_pointer;
433-
typedef typename __traits::__void_pointer __void_pointer;
434418

435419
__begin_node_pointer __ptr_;
436420

437-
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __begin_node_pointer __get_begin() const { return __ptr_; }
438-
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __node_pointer __get_unsafe_node_pointer() const {
439-
return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_);
440-
}
441-
442421
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_list_const_iterator(nullptr_t) _NOEXCEPT
443422
: __ptr_(nullptr) {}
444423

@@ -447,7 +426,7 @@ class __forward_list_const_iterator {
447426

448427
_LIBCPP_CONSTEXPR_SINCE_CXX26
449428
_LIBCPP_HIDE_FROM_ABI explicit __forward_list_const_iterator(__node_pointer __p) _NOEXCEPT
450-
: __ptr_(__traits::__as_iter_node(__p)) {}
429+
: __ptr_(std::__static_fancy_pointer_cast<__begin_node_pointer>(__p)) {}
451430

452431
template <class, class>
453432
friend class forward_list;
@@ -464,14 +443,14 @@ public:
464443
__forward_list_const_iterator(__forward_list_iterator<__node_pointer> __p) _NOEXCEPT : __ptr_(__p.__ptr_) {}
465444

466445
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI reference operator*() const {
467-
return __get_unsafe_node_pointer()->__get_value();
446+
return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_)->__get_value();
468447
}
469448
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI pointer operator->() const {
470-
return pointer_traits<pointer>::pointer_to(__get_unsafe_node_pointer()->__get_value());
449+
return pointer_traits<pointer>::pointer_to(std::__static_fancy_pointer_cast<__node_pointer>(__ptr_)->__get_value());
471450
}
472451

473452
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_const_iterator& operator++() {
474-
__ptr_ = __traits::__as_iter_node(__ptr_->__next_);
453+
__ptr_ = std::__static_fancy_pointer_cast<__begin_node_pointer>(__ptr_->__next_);
475454
return *this;
476455
}
477456
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_const_iterator operator++(int) {
@@ -963,7 +942,8 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 inline forward_list<_Tp, _Alloc>::forward_list(con
963942
template <class _Tp, class _Alloc>
964943
_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n) {
965944
if (__n > 0) {
966-
for (__begin_node_pointer __p = __base::__before_begin(); __n > 0; --__n, __p = __p->__next_as_begin()) {
945+
for (__begin_node_pointer __p = __base::__before_begin(); __n > 0;
946+
--__n, __p = std::__static_fancy_pointer_cast<__begin_node_pointer>(__p->__next_)) {
967947
__p->__next_ = this->__create_node(/* next = */ nullptr);
968948
}
969949
}
@@ -974,7 +954,8 @@ template <class _Tp, class _Alloc>
974954
_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n, const allocator_type& __base_alloc)
975955
: __base(__base_alloc) {
976956
if (__n > 0) {
977-
for (__begin_node_pointer __p = __base::__before_begin(); __n > 0; --__n, __p = __p->__next_as_begin()) {
957+
for (__begin_node_pointer __p = __base::__before_begin(); __n > 0;
958+
--__n, __p = std::__static_fancy_pointer_cast<__begin_node_pointer>(__p->__next_)) {
978959
__p->__next_ = this->__create_node(/* next = */ nullptr);
979960
}
980961
}
@@ -1167,15 +1148,15 @@ template <class _Tp, class _Alloc>
11671148
template <class... _Args>
11681149
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
11691150
forward_list<_Tp, _Alloc>::emplace_after(const_iterator __p, _Args&&... __args) {
1170-
__begin_node_pointer const __r = __p.__get_begin();
1151+
__begin_node_pointer const __r = __p.__ptr_;
11711152
__r->__next_ = this->__create_node(/* next = */ __r->__next_, std::forward<_Args>(__args)...);
11721153
return iterator(__r->__next_);
11731154
}
11741155

11751156
template <class _Tp, class _Alloc>
11761157
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
11771158
forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, value_type&& __v) {
1178-
__begin_node_pointer const __r = __p.__get_begin();
1159+
__begin_node_pointer const __r = __p.__ptr_;
11791160
__r->__next_ = this->__create_node(/* next = */ __r->__next_, std::move(__v));
11801161
return iterator(__r->__next_);
11811162
}
@@ -1185,7 +1166,7 @@ forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, value_type&& __v) {
11851166
template <class _Tp, class _Alloc>
11861167
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
11871168
forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, const value_type& __v) {
1188-
__begin_node_pointer const __r = __p.__get_begin();
1169+
__begin_node_pointer const __r = __p.__ptr_;
11891170
__r->__next_ = this->__create_node(/* next = */ __r->__next_, __v);
11901171
return iterator(__r->__next_);
11911172
}
@@ -1194,7 +1175,7 @@ template <class _Tp, class _Alloc>
11941175
template <class... _Args>
11951176
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
11961177
forward_list<_Tp, _Alloc>::__insert_after(const_iterator __p, size_type __n, _Args&&... __args) {
1197-
__begin_node_pointer __r = __p.__get_begin();
1178+
__begin_node_pointer __r = __p.__ptr_;
11981179
if (__n > 0) {
11991180
__node_pointer __first = this->__create_node(/* next = */ nullptr, std::forward<_Args>(__args)...);
12001181
__node_pointer __last = __first;
@@ -1216,7 +1197,7 @@ forward_list<_Tp, _Alloc>::__insert_after(const_iterator __p, size_type __n, _Ar
12161197
# endif // _LIBCPP_HAS_EXCEPTIONS
12171198
__last->__next_ = __r->__next_;
12181199
__r->__next_ = __first;
1219-
__r = __forward_node_traits<__node_pointer>::__as_iter_node(__last);
1200+
__r = std::__static_fancy_pointer_cast<__begin_node_pointer>(__last);
12201201
}
12211202
return iterator(__r);
12221203
}
@@ -1232,7 +1213,7 @@ template <class _Tp, class _Alloc>
12321213
template <class _InputIterator, class _Sentinel>
12331214
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI typename forward_list<_Tp, _Alloc>::iterator
12341215
forward_list<_Tp, _Alloc>::__insert_after_with_sentinel(const_iterator __p, _InputIterator __f, _Sentinel __l) {
1235-
__begin_node_pointer __r = __p.__get_begin();
1216+
__begin_node_pointer __r = __p.__ptr_;
12361217

12371218
if (__f != __l) {
12381219
__node_pointer __first = this->__create_node(/* next = */ nullptr, *__f);
@@ -1257,7 +1238,7 @@ forward_list<_Tp, _Alloc>::__insert_after_with_sentinel(const_iterator __p, _Inp
12571238

12581239
__last->__next_ = __r->__next_;
12591240
__r->__next_ = __first;
1260-
__r = __forward_node_traits<__node_pointer>::__as_iter_node(__last);
1241+
__r = std::__static_fancy_pointer_cast<__begin_node_pointer>(__last);
12611242
}
12621243

12631244
return iterator(__r);
@@ -1266,7 +1247,7 @@ forward_list<_Tp, _Alloc>::__insert_after_with_sentinel(const_iterator __p, _Inp
12661247
template <class _Tp, class _Alloc>
12671248
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
12681249
forward_list<_Tp, _Alloc>::erase_after(const_iterator __f) {
1269-
__begin_node_pointer __p = __f.__get_begin();
1250+
__begin_node_pointer __p = __f.__ptr_;
12701251
__node_pointer __n = __p->__next_;
12711252
__p->__next_ = __n->__next_;
12721253
this->__delete_node(__n);
@@ -1276,9 +1257,9 @@ forward_list<_Tp, _Alloc>::erase_after(const_iterator __f) {
12761257
template <class _Tp, class _Alloc>
12771258
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
12781259
forward_list<_Tp, _Alloc>::erase_after(const_iterator __f, const_iterator __l) {
1279-
__node_pointer __e = __l.__get_unsafe_node_pointer();
1260+
__node_pointer __e = std::__static_fancy_pointer_cast<__node_pointer>(__l.__ptr_);
12801261
if (__f != __l) {
1281-
__begin_node_pointer __bp = __f.__get_begin();
1262+
__begin_node_pointer __bp = __f.__ptr_;
12821263

12831264
__node_pointer __n = __bp->__next_;
12841265
if (__n != __e) {
@@ -1324,13 +1305,13 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::resize(size_type _
13241305
template <class _Tp, class _Alloc>
13251306
_LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::splice_after(const_iterator __p, forward_list& __x) {
13261307
if (!__x.empty()) {
1327-
if (__p.__get_begin()->__next_ != nullptr) {
1308+
if (__p.__ptr_->__next_ != nullptr) {
13281309
const_iterator __lm1 = __x.before_begin();
1329-
while (__lm1.__get_begin()->__next_ != nullptr)
1310+
while (__lm1.__ptr_->__next_ != nullptr)
13301311
++__lm1;
1331-
__lm1.__get_begin()->__next_ = __p.__get_begin()->__next_;
1312+
__lm1.__ptr_->__next_ = __p.__ptr_->__next_;
13321313
}
1333-
__p.__get_begin()->__next_ = __x.__before_begin()->__next_;
1314+
__p.__ptr_->__next_ = __x.__before_begin()->__next_;
13341315
__x.__before_begin()->__next_ = nullptr;
13351316
}
13361317
}
@@ -1340,9 +1321,9 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void
13401321
forward_list<_Tp, _Alloc>::splice_after(const_iterator __p, forward_list& /*__other*/, const_iterator __i) {
13411322
const_iterator __lm1 = std::next(__i);
13421323
if (__p != __i && __p != __lm1) {
1343-
__i.__get_begin()->__next_ = __lm1.__get_begin()->__next_;
1344-
__lm1.__get_begin()->__next_ = __p.__get_begin()->__next_;
1345-
__p.__get_begin()->__next_ = __lm1.__get_unsafe_node_pointer();
1324+
__i.__ptr_->__next_ = __lm1.__ptr_->__next_;
1325+
__lm1.__ptr_->__next_ = __p.__ptr_->__next_;
1326+
__p.__ptr_->__next_ = std::__static_fancy_pointer_cast<__node_pointer>(__lm1.__ptr_);
13461327
}
13471328
}
13481329

@@ -1351,12 +1332,12 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::splice_after(
13511332
const_iterator __p, forward_list& /*__other*/, const_iterator __f, const_iterator __l) {
13521333
if (__f != __l && __p != __f) {
13531334
const_iterator __lm1 = __f;
1354-
while (__lm1.__get_begin()->__next_ != __l.__get_begin())
1335+
while (__lm1.__ptr_->__next_ != __l.__ptr_)
13551336
++__lm1;
13561337
if (__f != __lm1) {
1357-
__lm1.__get_begin()->__next_ = __p.__get_begin()->__next_;
1358-
__p.__get_begin()->__next_ = __f.__get_begin()->__next_;
1359-
__f.__get_begin()->__next_ = __l.__get_unsafe_node_pointer();
1338+
__lm1.__ptr_->__next_ = __p.__ptr_->__next_;
1339+
__p.__ptr_->__next_ = __f.__ptr_->__next_;
1340+
__f.__ptr_->__next_ = std::__static_fancy_pointer_cast<__node_pointer>(__l.__ptr_);
13601341
}
13611342
}
13621343
}
@@ -1385,8 +1366,8 @@ forward_list<_Tp, _Alloc>::remove(const value_type& __v) {
13851366
forward_list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
13861367
typename forward_list<_Tp, _Alloc>::size_type __count_removed = 0;
13871368
const iterator __e = end();
1388-
for (iterator __i = before_begin(); __i.__get_begin()->__next_ != nullptr;) {
1389-
if (__i.__get_begin()->__next_->__get_value() == __v) {
1369+
for (iterator __i = before_begin(); __i.__ptr_->__next_ != nullptr;) {
1370+
if (__i.__ptr_->__next_->__get_value() == __v) {
13901371
++__count_removed;
13911372
iterator __j = std::next(__i, 2);
13921373
for (; __j != __e && *__j == __v; ++__j)
@@ -1409,8 +1390,8 @@ forward_list<_Tp, _Alloc>::remove_if(_Predicate __pred) {
14091390
forward_list<_Tp, _Alloc> __deleted_nodes(get_allocator()); // collect the nodes we're removing
14101391
typename forward_list<_Tp, _Alloc>::size_type __count_removed = 0;
14111392
const iterator __e = end();
1412-
for (iterator __i = before_begin(); __i.__get_begin()->__next_ != nullptr;) {
1413-
if (__pred(__i.__get_begin()->__next_->__get_value())) {
1393+
for (iterator __i = before_begin(); __i.__ptr_->__next_ != nullptr;) {
1394+
if (__pred(__i.__ptr_->__next_->__get_value())) {
14141395
++__count_removed;
14151396
iterator __j = std::next(__i, 2);
14161397
for (; __j != __e && __pred(*__j); ++__j)
@@ -1436,7 +1417,7 @@ forward_list<_Tp, _Alloc>::unique(_BinaryPredicate __binary_pred) {
14361417
iterator __j = std::next(__i);
14371418
for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
14381419
++__count_removed;
1439-
if (__i.__get_begin()->__next_ != __j.__get_unsafe_node_pointer())
1420+
if (__i.__ptr_->__next_ != std::__static_fancy_pointer_cast<__node_pointer>(__j.__ptr_))
14401421
__deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j);
14411422
__i = __j;
14421423
}
@@ -1516,7 +1497,7 @@ forward_list<_Tp, _Alloc>::__sort(__node_pointer __f1, difference_type __sz, _Co
15161497
}
15171498
difference_type __sz1 = __sz / 2;
15181499
difference_type __sz2 = __sz - __sz1;
1519-
__node_pointer __t = std::next(iterator(__f1), __sz1 - 1).__get_unsafe_node_pointer();
1500+
__node_pointer __t = std::__static_fancy_pointer_cast<__node_pointer>(std::next(iterator(__f1), __sz1 - 1).__ptr_);
15201501
__node_pointer __f2 = __t->__next_;
15211502
__t->__next_ = nullptr;
15221503
return __merge(__sort(__f1, __sz1, __comp), __sort(__f2, __sz2, __comp), __comp);

0 commit comments

Comments
 (0)