This is an archive of the discontinued LLVM Phabricator instance.

Differential D117410

[libc++] Introduce __debug_db_insert_i()
ClosedPublic

Authored by philnik on Jan 15 2022, 4:25 PM.

Details

Reviewers
• Quuxplusone
ldionne
Mordante
Group Reviewers
Restricted Project
Commits
rGcaf5548c7cc6: [libc++] Introduce __debug_db_insert_i()
Summary

Introduce __debug_db_insert_i()

Diff Detail

Event Timeline

philnik requested review of this revision.Jan 15 2022, 4:25 PM
philnik created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 15 2022, 4:25 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B143629: Diff 400330.Jan 15 2022, 5:29 PM
ldionne accepted this revision.Jan 17 2022, 8:51 AM

LGTM with qualification.

libcxx/include/__hash_table
648

Can you please qualify?

This revision is now accepted and ready to land.Jan 17 2022, 8:51 AM
philnik added inline comments.Jan 17 2022, 8:59 AM
libcxx/include/__hash_table
648

Sorry, I don't understand what you want. Qualify what?

• Quuxplusone added inline comments.Jan 17 2022, 9:04 AM
libcxx/include/__hash_table
648

ADL-proof via _VSTD::__debug_db_insert_i(this). Otherwise this is triggering ADL.

philnik updated this revision to Diff 400604.Jan 17 2022, 10:27 AM
philnik marked 2 inline comments as done.
  • Add _VSTD::
ldionne accepted this revision.Jan 17 2022, 10:41 AM
ldionne added inline comments.
libcxx/include/__hash_table
648

@philnik Sorry, I thought my request was clear since I remembered asking the same on a similar review of yours, but I might be mis-remembering.

Harbormaster completed remote builds in B143842: Diff 400604.Jan 17 2022, 11:29 AM
Closed by commit rGcaf5548c7cc6: [libc++] Introduce __debug_db_insert_i() (authored by philnik). · Explain WhyJan 17 2022, 11:33 AM
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rGcaf5548c7cc6: [libc++] Introduce __debug_db_insert_i().

Revision Contents

PathSize
libcxx/
include/
10 lines
16 lines
__iterator/
5 lines
8 lines

Diff 400330

libcxx/include/__debug

Show First 20 Lines • Show All 273 Lines • ▼ Show 20 Lines
#if _LIBCPP_DEBUG_LEVEL == 2 #if _LIBCPP_DEBUG_LEVEL == 2
if (!__libcpp_is_constant_evaluated()) if (!__libcpp_is_constant_evaluated())
__get_db()->__insert_c(__c); __get_db()->__insert_c(__c);
#else #else
(void)(__c); (void)(__c);
#endif #endif
} }
template <class _Tp>
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 inline void __debug_db_insert_i(_Tp* __i) {
#if _LIBCPP_DEBUG_LEVEL == 2
if (!__libcpp_is_constant_evaluated())
__get_db()->__insert_i(__i);
#else
(void)(__i);
#endif
}
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_DEBUG_H #endif // _LIBCPP_DEBUG_H

libcxx/include/__hash_table

Show First 20 Lines • Show All 282 Lines • ▼ Show 20 Lines
public: public:
typedef forward_iterator_tag iterator_category; typedef forward_iterator_tag iterator_category;
typedef typename _NodeTypes::__node_value_type value_type; typedef typename _NodeTypes::__node_value_type value_type;
typedef typename _NodeTypes::difference_type difference_type; typedef typename _NodeTypes::difference_type difference_type;
typedef value_type& reference; typedef value_type& reference;
typedef typename _NodeTypes::__node_value_type_pointer pointer; typedef typename _NodeTypes::__node_value_type_pointer pointer;
_LIBCPP_INLINE_VISIBILITY __hash_iterator() _NOEXCEPT : __node_(nullptr) { _LIBCPP_INLINE_VISIBILITY __hash_iterator() _NOEXCEPT : __node_(nullptr) {
#if _LIBCPP_DEBUG_LEVEL == 2 __debug_db_insert_i(this);
__get_db()->__insert_i(this);
#endif
} }
#if _LIBCPP_DEBUG_LEVEL == 2 #if _LIBCPP_DEBUG_LEVEL == 2
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__hash_iterator(const __hash_iterator& __i) __hash_iterator(const __hash_iterator& __i)
: __node_(__i.__node_) : __node_(__i.__node_)
{ {
__get_db()->__iterator_copy(this, _VSTD::addressof(__i)); __get_db()->__iterator_copy(this, _VSTD::addressof(__i));
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Linespublic:
typedef forward_iterator_tag iterator_category; typedef forward_iterator_tag iterator_category;
typedef typename _NodeTypes::__node_value_type value_type; typedef typename _NodeTypes::__node_value_type value_type;
typedef typename _NodeTypes::difference_type difference_type; typedef typename _NodeTypes::difference_type difference_type;
typedef const value_type& reference; typedef const value_type& reference;
typedef typename _NodeTypes::__const_node_value_type_pointer pointer; typedef typename _NodeTypes::__const_node_value_type_pointer pointer;
_LIBCPP_INLINE_VISIBILITY __hash_const_iterator() _NOEXCEPT : __node_(nullptr) { _LIBCPP_INLINE_VISIBILITY __hash_const_iterator() _NOEXCEPT : __node_(nullptr) {
#if _LIBCPP_DEBUG_LEVEL == 2 __debug_db_insert_i(this);
__get_db()->__insert_i(this);
#endif
} }
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__hash_const_iterator(const __non_const_iterator& __x) _NOEXCEPT __hash_const_iterator(const __non_const_iterator& __x) _NOEXCEPT
: __node_(__x.__node_) : __node_(__x.__node_)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 #if _LIBCPP_DEBUG_LEVEL == 2
__get_db()->__iterator_copy(this, &__x); __get_db()->__iterator_copy(this, &__x);
▲ Show 20 Lines • Show All 98 Lines • ▼ Show 20 Lines
public: public:
typedef forward_iterator_tag iterator_category; typedef forward_iterator_tag iterator_category;
typedef typename _NodeTypes::__node_value_type value_type; typedef typename _NodeTypes::__node_value_type value_type;
typedef typename _NodeTypes::difference_type difference_type; typedef typename _NodeTypes::difference_type difference_type;
typedef value_type& reference; typedef value_type& reference;
typedef typename _NodeTypes::__node_value_type_pointer pointer; typedef typename _NodeTypes::__node_value_type_pointer pointer;
_LIBCPP_INLINE_VISIBILITY __hash_local_iterator() _NOEXCEPT : __node_(nullptr) { _LIBCPP_INLINE_VISIBILITY __hash_local_iterator() _NOEXCEPT : __node_(nullptr) {
#if _LIBCPP_DEBUG_LEVEL == 2 __debug_db_insert_i(this);
__get_db()->__insert_i(this);
#endif
} }
#if _LIBCPP_DEBUG_LEVEL == 2 #if _LIBCPP_DEBUG_LEVEL == 2
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__hash_local_iterator(const __hash_local_iterator& __i) __hash_local_iterator(const __hash_local_iterator& __i)
: __node_(__i.__node_), : __node_(__i.__node_),
__bucket_(__i.__bucket_), __bucket_(__i.__bucket_),
__bucket_count_(__i.__bucket_count_) __bucket_count_(__i.__bucket_count_)
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Linespublic:
typedef forward_iterator_tag iterator_category; typedef forward_iterator_tag iterator_category;
typedef typename _NodeTypes::__node_value_type value_type; typedef typename _NodeTypes::__node_value_type value_type;
typedef typename _NodeTypes::difference_type difference_type; typedef typename _NodeTypes::difference_type difference_type;
typedef const value_type& reference; typedef const value_type& reference;
typedef typename _NodeTypes::__const_node_value_type_pointer pointer; typedef typename _NodeTypes::__const_node_value_type_pointer pointer;
_LIBCPP_INLINE_VISIBILITY __hash_const_local_iterator() _NOEXCEPT : __node_(nullptr) { _LIBCPP_INLINE_VISIBILITY __hash_const_local_iterator() _NOEXCEPT : __node_(nullptr) {
#if _LIBCPP_DEBUG_LEVEL == 2 __debug_db_insert_i(this);
ldionneUnsubmitted
Done
ReplyInline Actions

Can you please qualify?

ldionne: Can you please qualify?
philnikAuthorUnsubmitted
Done
ReplyInline Actions

Sorry, I don't understand what you want. Qualify what?

philnik: Sorry, I don't understand what you want. Qualify what?
QuuxplusoneUnsubmitted
Done
ReplyInline Actions

ADL-proof via _VSTD::__debug_db_insert_i(this). Otherwise this is triggering ADL.

Quuxplusone: ADL-proof via `_VSTD::__debug_db_insert_i(this)`. Otherwise this is triggering ADL.
ldionneUnsubmitted
Done
ReplyInline Actions

@philnik Sorry, I thought my request was clear since I remembered asking the same on a similar review of yours, but I might be mis-remembering.

ldionne: @philnik Sorry, I thought my request was clear since I remembered asking the same on a similar…
__get_db()->__insert_i(this);
#endif
} }
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__hash_const_local_iterator(const __non_const_iterator& __x) _NOEXCEPT __hash_const_local_iterator(const __non_const_iterator& __x) _NOEXCEPT
: __node_(__x.__node_), : __node_(__x.__node_),
__bucket_(__x.__bucket_), __bucket_(__x.__bucket_),
__bucket_count_(__x.__bucket_count_) __bucket_count_(__x.__bucket_count_)
{ {
▲ Show 20 Lines • Show All 2,143 Lines • Show Last 20 Lines

libcxx/include/__iterator/wrap_iter.h

Show All 37 Lines
#endif #endif
private: private:
iterator_type __i; iterator_type __i;
public: public:
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter() _NOEXCEPT _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 __wrap_iter() _NOEXCEPT
: __i() : __i()
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 __debug_db_insert_i(this);
if (!__libcpp_is_constant_evaluated())
__get_db()->__insert_i(this);
#endif
} }
template <class _Up> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11 template <class _Up> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX11
__wrap_iter(const __wrap_iter<_Up>& __u, __wrap_iter(const __wrap_iter<_Up>& __u,
typename enable_if<is_convertible<_Up, iterator_type>::value>::type* = nullptr) _NOEXCEPT typename enable_if<is_convertible<_Up, iterator_type>::value>::type* = nullptr) _NOEXCEPT
: __i(__u.base()) : __i(__u.base())
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 #if _LIBCPP_DEBUG_LEVEL == 2
if (!__libcpp_is_constant_evaluated()) if (!__libcpp_is_constant_evaluated())
▲ Show 20 Lines • Show All 231 Lines • Show Last 20 Lines

libcxx/include/list

Show First 20 Lines • Show All 313 Lines • ▼ Show 20 Linespublic:
typedef _Tp value_type; typedef _Tp value_type;
typedef value_type& reference; typedef value_type& reference;
typedef typename __rebind_pointer<_VoidPtr, value_type>::type pointer; typedef typename __rebind_pointer<_VoidPtr, value_type>::type pointer;
typedef typename pointer_traits<pointer>::difference_type difference_type; typedef typename pointer_traits<pointer>::difference_type difference_type;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__list_iterator() _NOEXCEPT : __ptr_(nullptr) __list_iterator() _NOEXCEPT : __ptr_(nullptr)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 __debug_db_insert_i(this);
__get_db()->__insert_i(this);
#endif
} }
#if _LIBCPP_DEBUG_LEVEL == 2 #if _LIBCPP_DEBUG_LEVEL == 2
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__list_iterator(const __list_iterator& __p) __list_iterator(const __list_iterator& __p)
: __ptr_(__p.__ptr_) : __ptr_(__p.__ptr_)
{ {
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Linespublic:
typedef _Tp value_type; typedef _Tp value_type;
typedef const value_type& reference; typedef const value_type& reference;
typedef typename __rebind_pointer<_VoidPtr, const value_type>::type pointer; typedef typename __rebind_pointer<_VoidPtr, const value_type>::type pointer;
typedef typename pointer_traits<pointer>::difference_type difference_type; typedef typename pointer_traits<pointer>::difference_type difference_type;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__list_const_iterator() _NOEXCEPT : __ptr_(nullptr) __list_const_iterator() _NOEXCEPT : __ptr_(nullptr)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 __debug_db_insert_i(this);
__get_db()->__insert_i(this);
#endif
} }
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__list_const_iterator(const __list_iterator<_Tp, _VoidPtr>& __p) _NOEXCEPT __list_const_iterator(const __list_iterator<_Tp, _VoidPtr>& __p) _NOEXCEPT
: __ptr_(__p.__ptr_) : __ptr_(__p.__ptr_)
{ {
#if _LIBCPP_DEBUG_LEVEL == 2 #if _LIBCPP_DEBUG_LEVEL == 2
__get_db()->__iterator_copy(this, _VSTD::addressof(__p)); __get_db()->__iterator_copy(this, _VSTD::addressof(__p));
#endif #endif
▲ Show 20 Lines • Show All 1,978 Lines • Show Last 20 Lines