Skip to content

Commit 195996f

Browse files
elsteveograndeelsteveogrande
committed
fix clang-tidy errors
1 parent 9867246 commit 195996f

File tree

5 files changed

+19
-32
lines changed

5 files changed

+19
-32
lines changed

‎libcxx/include/__stacktrace/base.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,22 @@ struct _LIBCPP_EXPORTED_FROM_ABI base {
9595
return list(std::forward<_Args>(__args)..., make_alloc<_Tp>());
9696
}
9797

98+
template <class _Allocator>
99+
auto _LIBCPP_HIDE_FROM_ABI __alloc_wrap(_Allocator const& __alloc) {
100+
using _AT = allocator_traits<_Allocator>;
101+
using _BA = typename _AT::template rebind_alloc<byte>;
102+
auto __ba = _BA(__alloc);
103+
return [__ba = std::move(__ba)](size_t __sz) mutable { return __ba.allocate(__sz); };
104+
}
105+
106+
template <class _Allocator>
107+
auto _LIBCPP_HIDE_FROM_ABI __dealloc_wrap(_Allocator const& __alloc) {
108+
using _AT = allocator_traits<_Allocator>;
109+
using _BA = typename _AT::template rebind_alloc<byte>;
110+
auto __ba = _BA(__alloc);
111+
return [__ba = std::move(__ba)](void* __ptr, size_t __sz) mutable { __ba.deallocate((byte*)__ptr, __sz); };
112+
}
113+
98114
_LIBCPP_NO_TAIL_CALLS _LIBCPP_NOINLINE _LIBCPP_EXPORTED_FROM_ABI void
99115
build_stacktrace(size_t __skip, size_t __max_depth);
100116

@@ -119,22 +135,6 @@ struct _LIBCPP_HIDE_FROM_ABI entry_base {
119135
_LIBCPP_HIDE_FROM_ABI stacktrace_entry to_stacktrace_entry() const;
120136
};
121137

122-
template <class _Allocator>
123-
auto __alloc_wrap(_Allocator const& __alloc) {
124-
using _AT = allocator_traits<_Allocator>;
125-
using _BA = typename _AT::template rebind_alloc<byte>;
126-
auto __ba = _BA(__alloc);
127-
return [__ba = std::move(__ba)](size_t __sz) mutable { return __ba.allocate(__sz); };
128-
}
129-
130-
template <class _Allocator>
131-
auto __dealloc_wrap(_Allocator const& __alloc) {
132-
using _AT = allocator_traits<_Allocator>;
133-
using _BA = typename _AT::template rebind_alloc<byte>;
134-
auto __ba = _BA(__alloc);
135-
return [__ba = std::move(__ba)](void* __ptr, size_t __sz) mutable { __ba.deallocate((byte*)__ptr, __sz); };
136-
}
137-
138138
template <class _Allocator>
139139
_LIBCPP_EXPORTED_FROM_ABI base::base(_Allocator __alloc)
140140
: __alloc_bytes_(__alloc_wrap(__alloc)),

‎libcxx/include/__stacktrace/basic.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,13 @@ class _LIBCPP_EXPORTED_FROM_ABI basic_stacktrace : private __stacktrace::base {
113113
: base(__alloc), __entries_(__alloc_) {}
114114

115115
_LIBCPP_EXPORTED_FROM_ABI basic_stacktrace(basic_stacktrace const& __other)
116-
: __alloc_(_ATraits::select_on_container_copy_construction(__other.__alloc_)),
117-
__entries_(__other.__entries_, __alloc_) {}
116+
: basic_stacktrace(__other, _ATraits::select_on_container_copy_construction(__other.__alloc_)) {}
118117

119118
_LIBCPP_EXPORTED_FROM_ABI basic_stacktrace(basic_stacktrace&& __other) noexcept
120119
: __alloc_(std::move(__other.__alloc_)), __entries_(std::move(__other.__entries_)) {}
121120

122121
_LIBCPP_EXPORTED_FROM_ABI basic_stacktrace(basic_stacktrace const& __other, allocator_type const& __alloc)
123-
: base(__alloc), __entries_(__other.__entries_, __alloc) {}
122+
: base(__alloc), __alloc_(__alloc), __entries_(__other.__entries_, __alloc) {}
124123

125124
_LIBCPP_EXPORTED_FROM_ABI basic_stacktrace(basic_stacktrace&& __other, allocator_type const& __alloc)
126125
: base(__alloc) {

‎libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.abilist

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,8 +1631,6 @@
16311631
{'is_defined': True, 'name': '_ZTINSt3__110__function6__baseIFbRKNS_12__stacktrace3elf7SectionEEEE', 'size': 16, 'type': 'OBJECT'}
16321632
{'is_defined': True, 'name': '_ZTINSt3__110__function6__baseIFbRKNS_12__stacktrace4toolEEEE', 'size': 16, 'type': 'OBJECT'}
16331633
{'is_defined': True, 'name': '_ZTINSt3__110__function6__baseIFvPSt4bytemEEE', 'size': 16, 'type': 'OBJECT'}
1634-
{'is_defined': True, 'name': '_ZTINSt3__110__function6__funcIZNS_12__stacktrace12__alloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlmE_FPSt4bytemEEE', 'size': 24, 'type': 'OBJECT'}
1635-
{'is_defined': True, 'name': '_ZTINSt3__110__function6__funcIZNS_12__stacktrace14__dealloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlPvmE_FvPSt4bytemEEE', 'size': 24, 'type': 'OBJECT'}
16361634
{'is_defined': True, 'name': '_ZTINSt3__110__time_getE', 'size': 16, 'type': 'OBJECT'}
16371635
{'is_defined': True, 'name': '_ZTINSt3__110__time_putE', 'size': 16, 'type': 'OBJECT'}
16381636
{'is_defined': True, 'name': '_ZTINSt3__110ctype_baseE', 'size': 16, 'type': 'OBJECT'}
@@ -1770,17 +1768,13 @@
17701768
{'is_defined': True, 'name': '_ZTISt16nested_exception', 'size': 16, 'type': 'OBJECT'}
17711769
{'is_defined': True, 'name': '_ZTISt18bad_variant_access', 'size': 24, 'type': 'OBJECT'}
17721770
{'is_defined': True, 'name': '_ZTISt19bad_optional_access', 'size': 24, 'type': 'OBJECT'}
1773-
{'is_defined': True, 'name': '_ZTIZNSt3__112__stacktrace12__alloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlmE_', 'size': 16, 'type': 'OBJECT'}
1774-
{'is_defined': True, 'name': '_ZTIZNSt3__112__stacktrace14__dealloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlPvmE_', 'size': 16, 'type': 'OBJECT'}
17751771
{'is_defined': True, 'name': '_ZTSNSt12experimental15fundamentals_v112bad_any_castE', 'size': 50, 'type': 'OBJECT'}
17761772
{'is_defined': True, 'name': '_ZTSNSt12experimental19bad_optional_accessE', 'size': 40, 'type': 'OBJECT'}
17771773
{'is_defined': True, 'name': '_ZTSNSt3__110__function6__baseIFPSt4bytemEEE', 'size': 41, 'type': 'OBJECT'}
17781774
{'is_defined': True, 'name': '_ZTSNSt3__110__function6__baseIFbRKNS_12__stacktrace3elf6SymbolEEEE', 'size': 64, 'type': 'OBJECT'}
17791775
{'is_defined': True, 'name': '_ZTSNSt3__110__function6__baseIFbRKNS_12__stacktrace3elf7SectionEEEE', 'size': 65, 'type': 'OBJECT'}
17801776
{'is_defined': True, 'name': '_ZTSNSt3__110__function6__baseIFbRKNS_12__stacktrace4toolEEEE', 'size': 58, 'type': 'OBJECT'}
17811777
{'is_defined': True, 'name': '_ZTSNSt3__110__function6__baseIFvPSt4bytemEEE', 'size': 42, 'type': 'OBJECT'}
1782-
{'is_defined': True, 'name': '_ZTSNSt3__110__function6__funcIZNS_12__stacktrace12__alloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlmE_FPSt4bytemEEE', 'size': 126, 'type': 'OBJECT'}
1783-
{'is_defined': True, 'name': '_ZTSNSt3__110__function6__funcIZNS_12__stacktrace14__dealloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlPvmE_FvPSt4bytemEEE', 'size': 131, 'type': 'OBJECT'}
17841778
{'is_defined': True, 'name': '_ZTSNSt3__110__time_getE', 'size': 21, 'type': 'OBJECT'}
17851779
{'is_defined': True, 'name': '_ZTSNSt3__110__time_putE', 'size': 21, 'type': 'OBJECT'}
17861780
{'is_defined': True, 'name': '_ZTSNSt3__110ctype_baseE', 'size': 21, 'type': 'OBJECT'}
@@ -1918,8 +1912,6 @@
19181912
{'is_defined': True, 'name': '_ZTSSt16nested_exception', 'size': 21, 'type': 'OBJECT'}
19191913
{'is_defined': True, 'name': '_ZTSSt18bad_variant_access', 'size': 23, 'type': 'OBJECT'}
19201914
{'is_defined': True, 'name': '_ZTSSt19bad_optional_access', 'size': 24, 'type': 'OBJECT'}
1921-
{'is_defined': True, 'name': '_ZTSZNSt3__112__stacktrace12__alloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlmE_', 'size': 90, 'type': 'OBJECT'}
1922-
{'is_defined': True, 'name': '_ZTSZNSt3__112__stacktrace14__dealloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlPvmE_', 'size': 94, 'type': 'OBJECT'}
19231915
{'is_defined': True, 'name': '_ZTTNSt3__110istrstreamE', 'size': 32, 'type': 'OBJECT'}
19241916
{'is_defined': True, 'name': '_ZTTNSt3__110ostrstreamE', 'size': 32, 'type': 'OBJECT'}
19251917
{'is_defined': True, 'name': '_ZTTNSt3__112__stacktrace10fd_istreamE', 'size': 32, 'type': 'OBJECT'}
@@ -1936,8 +1928,6 @@
19361928
{'is_defined': True, 'name': '_ZTTNSt3__19strstreamE', 'size': 80, 'type': 'OBJECT'}
19371929
{'is_defined': True, 'name': '_ZTVNSt12experimental15fundamentals_v112bad_any_castE', 'size': 40, 'type': 'OBJECT'}
19381930
{'is_defined': True, 'name': '_ZTVNSt12experimental19bad_optional_accessE', 'size': 40, 'type': 'OBJECT'}
1939-
{'is_defined': True, 'name': '_ZTVNSt3__110__function6__funcIZNS_12__stacktrace12__alloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlmE_FPSt4bytemEEE', 'size': 88, 'type': 'OBJECT'}
1940-
{'is_defined': True, 'name': '_ZTVNSt3__110__function6__funcIZNS_12__stacktrace14__dealloc_wrapINS_9allocatorINS_16stacktrace_entryEEEEEDaRKT_EUlPvmE_FvPSt4bytemEEE', 'size': 88, 'type': 'OBJECT'}
19411931
{'is_defined': True, 'name': '_ZTVNSt3__110istrstreamE', 'size': 80, 'type': 'OBJECT'}
19421932
{'is_defined': True, 'name': '_ZTVNSt3__110moneypunctIcLb0EEE', 'size': 112, 'type': 'OBJECT'}
19431933
{'is_defined': True, 'name': '_ZTVNSt3__110moneypunctIcLb1EEE', 'size': 112, 'type': 'OBJECT'}

‎libcxx/src/stacktrace/macos/impl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
#include <cstddef>
1515
#include <cstdlib>
1616

17-
#include <__config>
18-
#include <__config_site>
1917
#include <__stacktrace/base.h>
2018

2119
_LIBCPP_BEGIN_NAMESPACE_STD

‎libcxx/src/stacktrace/utils/fd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ struct fd_mmap final {
110110

111111
_LIBCPP_HIDE_FROM_ABI explicit fd_mmap(fd&& fd) : fd_(std::move(fd)) {
112112
if (fd_) {
113-
if ((size_ = ::lseek(fd, 0, SEEK_END))) {
113+
if ((size_ = ::lseek(fd_, 0, SEEK_END))) {
114114
addr_ = (std::byte const*)::mmap(nullptr, size_, PROT_READ, MAP_SHARED, fd_, 0);
115115
}
116116
}

0 commit comments

Comments
 (0)