Skip to content

Commit 13551cb

Browse files
cjdbcjdb
committed
fixes CI issues
1 parent 88bc350 commit 13551cb

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎libcxx/include/__split_buffer‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,77 +97,77 @@ public:
9797
: __alloc_(__alloc)
9898
{}
9999

100-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer first() noexcept {
100+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer first() _NOEXCEPT {
101101
return __first_;
102102
}
103-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_pointer first() const noexcept {
103+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_pointer first() const _NOEXCEPT {
104104
return __first_;
105105
}
106106

107-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer begin() noexcept {
107+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer begin() _NOEXCEPT {
108108
return __begin_;
109109
}
110-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_pointer begin() const noexcept {
110+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_pointer begin() const _NOEXCEPT {
111111
return __begin_;
112112
}
113113

114-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer end() noexcept {
114+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer end() _NOEXCEPT {
115115
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
116116
return __begin_ + __size_;
117117
#else
118118
return __end_;
119119
#endif
120120
}
121121

122-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer end() const noexcept {
122+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer end() const _NOEXCEPT {
123123
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
124124
return __begin_ + __size_;
125125
#else
126126
return __end_;
127127
#endif
128128
}
129129

130-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type size() const noexcept {
130+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT {
131131
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
132132
return __size_;
133133
#else
134134
return static_cast<size_type>(__end_ - __begin_);
135135
#endif
136136
}
137137

138-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool empty() const noexcept {
138+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool empty() const _NOEXCEPT {
139139
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
140140
return __size_ == 0;
141141
#else
142142
return __begin_ == __end_;
143143
#endif
144144
}
145145

146-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type capacity() const noexcept {
146+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type capacity() const _NOEXCEPT {
147147
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
148148
return __cap_;
149149
#else
150150
return static_cast<size_type>(__cap_ - __first_);
151151
#endif
152152
}
153153

154-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __capacity_as_pointer() noexcept {
154+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __capacity_as_pointer() _NOEXCEPT {
155155
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
156156
return __first_ + __cap_;
157157
#else
158158
return __cap_;
159159
#endif
160160
}
161161

162-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __capacity_as_pointer() const noexcept {
162+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __capacity_as_pointer() const _NOEXCEPT {
163163
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
164164
return __first_ + __cap_;
165165
#else
166166
return __cap_;
167167
#endif
168168
}
169169

170-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_begin(pointer __new_begin) noexcept {
170+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_begin(pointer __new_begin) _NOEXCEPT {
171171
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
172172
__size_ -= __new_begin - __begin_;
173173
#else
@@ -177,11 +177,11 @@ public:
177177
__begin_ = __new_begin;
178178
}
179179

180-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __front_spare() const noexcept {
180+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __front_spare() const _NOEXCEPT {
181181
return static_cast<size_type>(__begin_ - __first_);
182182
}
183183

184-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_sentinel(pointer __new_end) noexcept {
184+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_sentinel(pointer __new_end) _NOEXCEPT {
185185
_LIBCPP_ASSERT(__first_ <= __new_end, "__new_end cannot precede __first_");
186186
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
187187
__size_ += __new_end - end();
@@ -190,23 +190,23 @@ public:
190190
#endif
191191
}
192192

193-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_sentinel(size_type __new_size) noexcept {
193+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_sentinel(size_type __new_size) _NOEXCEPT {
194194
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
195195
__size_ = __new_size;
196196
#else
197197
__end_ = __begin_ + __new_size;
198198
#endif
199199
}
200200

201-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_capacity(size_type __new_capacity) noexcept {
201+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __update_capacity(size_type __new_capacity) _NOEXCEPT {
202202
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
203203
__cap_ = __new_capacity;
204204
#else
205205
__cap_ = __first_ + __new_capacity;
206206
#endif
207207
}
208208

209-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __back_spare() const noexcept {
209+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __back_spare() const _NOEXCEPT {
210210
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
211211
// `__cap_ - __end_` tells us the total number of spares when in size-mode. We need to remove
212212
// the __front_spare from the count.
@@ -216,15 +216,15 @@ public:
216216
#endif
217217
}
218218

219-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference back() noexcept {
219+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference back() _NOEXCEPT {
220220
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
221221
return __begin_[__size_ - 1];
222222
#else
223223
return *(__end_ - 1);
224224
#endif
225225
}
226226

227-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference back() const noexcept {
227+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference back() const _NOEXCEPT {
228228
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
229229
return __begin_[__size_ - 1];
230230
#else
@@ -233,7 +233,7 @@ public:
233233
}
234234

235235
template<class _Data2>
236-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __swap_without_allocator(_Data2& __other) noexcept {
236+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __swap_without_allocator(_Data2& __other) _NOEXCEPT {
237237
std::swap(__first_, __other.__first_);
238238
std::swap(__begin_, __other.__begin_);
239239
std::swap(__cap_, __other.__cap_);
@@ -244,12 +244,12 @@ public:
244244
#endif
245245
}
246246

247-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void swap(__data& __other) noexcept {
247+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void swap(__data& __other) _NOEXCEPT {
248248
__swap_without_allocator(__other);
249249
std::__swap_allocator(__alloc_, __other.__alloc_);
250250
}
251251

252-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __invariants() const noexcept {
252+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __invariants() const _NOEXCEPT {
253253
if (__first_ == nullptr) {
254254
if (__begin_ != nullptr) {
255255
return false;
@@ -281,15 +281,15 @@ public:
281281
return true;
282282
}
283283

284-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __is_full() const noexcept {
284+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __is_full() const _NOEXCEPT {
285285
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
286286
return __size_ == __cap_;
287287
#else
288288
return __end_ == __cap_;
289289
#endif
290290
}
291291

292-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __reset() noexcept {
292+
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __reset() _NOEXCEPT {
293293
__first_ = nullptr;
294294
__begin_ = nullptr;
295295
#ifdef _LIBCPP_ABI_SIZE_BASED_VECTOR
@@ -302,7 +302,7 @@ public:
302302
}
303303

304304
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __copy_without_alloc(__data const& __other)
305-
noexcept(is_nothrow_copy_assignable<pointer>::value)
305+
_NOEXCEPT_(is_nothrow_copy_assignable<pointer>::value)
306306
{
307307
__first_ = __other.__first_;
308308
__begin_ = __other.__begin_;
@@ -322,7 +322,7 @@ public:
322322

323323
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __split_buffer()
324324
_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
325-
: __data_{}
325+
: __data_()
326326
{}
327327

328328
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit __split_buffer(__alloc_rr& __a)
@@ -420,7 +420,7 @@ private:
420420

421421
struct _ConstructTransaction {
422422
_LIBCPP_CONSTEXPR_SINCE_CXX20
423-
_LIBCPP_HIDE_FROM_ABI explicit _ConstructTransaction(__split_buffer* __parent, pointer __p, size_type __n) noexcept
423+
_LIBCPP_HIDE_FROM_ABI explicit _ConstructTransaction(__split_buffer* __parent, pointer __p, size_type __n) _NOEXCEPT
424424
: __pos_(__p),
425425
__end_(__p + __n),
426426
__parent_(__parent) {}

‎libcxx/utils/gdb/libcxx/printers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ class StdDequePrinter(object):
426426
def __init__(self, val):
427427
self.val = val
428428
self.size = int(val["__size_"])
429-
self.start_ptr = self.val["__map_"]["__begin_"]
429+
self.start_ptr = self.val["__map_"]["__data_"]["__begin_"]
430430
self.first_block_start_index = int(self.val["__start_"])
431431
self.node_type = self.start_ptr.type
432432
self.block_size = self._calculate_block_size(val.type.template_argument(0))

0 commit comments

Comments
 (0)