Skip to content

Commit e710523

Browse files
adrian-prantladrian-prantl
committed
Change GetChildAtIndex to take a uint32_t
1 parent 3d7c5b8 commit e710523

37 files changed

+100
-99
lines changed

‎lldb/include/lldb/Core/ValueObject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ class ValueObject {
465465
/// Returns a unique id for this ValueObject.
466466
lldb::user_id_t GetID() const { return m_id.GetID(); }
467467

468-
virtual lldb::ValueObjectSP GetChildAtIndex(size_t idx,
468+
virtual lldb::ValueObjectSP GetChildAtIndex(uint32_t idx,
469469
bool can_create = true);
470470

471471
// The method always creates missing children in the path, if necessary.
@@ -791,7 +791,7 @@ class ValueObject {
791791
return (m_children.find(idx) != m_children.end());
792792
}
793793

794-
ValueObject *GetChildAtIndex(size_t idx) {
794+
ValueObject *GetChildAtIndex(uint32_t idx) {
795795
std::lock_guard<std::recursive_mutex> guard(m_mutex);
796796
const auto iter = m_children.find(idx);
797797
return ((iter == m_children.end()) ? nullptr : iter->second);

‎lldb/include/lldb/Core/ValueObjectSyntheticFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ValueObjectSynthetic : public ValueObject {
5151

5252
lldb::ValueType GetValueType() const override;
5353

54-
lldb::ValueObjectSP GetChildAtIndex(size_t idx,
54+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx,
5555
bool can_create = true) override;
5656

5757
lldb::ValueObjectSP GetChildMemberWithName(llvm::StringRef name,

‎lldb/include/lldb/DataFormatters/TypeSynthetic.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SyntheticChildrenFrontEnd {
4545
return count <= max ? count : max;
4646
}
4747

48-
virtual lldb::ValueObjectSP GetChildAtIndex(size_t idx) = 0;
48+
virtual lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) = 0;
4949

5050
virtual size_t GetIndexOfChildWithName(ConstString name) = 0;
5151

@@ -111,7 +111,7 @@ class SyntheticValueProviderFrontEnd : public SyntheticChildrenFrontEnd {
111111

112112
uint32_t CalculateNumChildren() override { return 0; }
113113

114-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override { return nullptr; }
114+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override { return nullptr; }
115115

116116
size_t GetIndexOfChildWithName(ConstString name) override {
117117
return UINT32_MAX;
@@ -324,7 +324,7 @@ class TypeFilterImpl : public SyntheticChildren {
324324

325325
uint32_t CalculateNumChildren() override { return filter->GetCount(); }
326326

327-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
327+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override {
328328
if (idx >= filter->GetCount())
329329
return lldb::ValueObjectSP();
330330
return m_backend.GetSyntheticExpressionPathChild(
@@ -430,7 +430,7 @@ class ScriptedSyntheticChildren : public SyntheticChildren {
430430

431431
uint32_t CalculateNumChildren(uint32_t max) override;
432432

433-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
433+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
434434

435435
lldb::ChildCacheState Update() override;
436436

‎lldb/include/lldb/DataFormatters/VectorIterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class VectorIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
2626

2727
uint32_t CalculateNumChildren() override;
2828

29-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
29+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
3030

3131
lldb::ChildCacheState Update() override;
3232

‎lldb/source/Core/ValueObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ bool ValueObject::IsLogicalTrue(Status &error) {
372372
return ret;
373373
}
374374

375-
ValueObjectSP ValueObject::GetChildAtIndex(size_t idx, bool can_create) {
375+
ValueObjectSP ValueObject::GetChildAtIndex(uint32_t idx, bool can_create) {
376376
ValueObjectSP child_sp;
377377
// We may need to update our value if we are dynamic
378378
if (IsPossibleDynamicType())

‎lldb/source/Core/ValueObjectSyntheticFilter.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DummySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
3333

3434
uint32_t CalculateNumChildren() override { return m_backend.GetNumChildren(); }
3535

36-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
36+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override {
3737
return m_backend.GetChildAtIndex(idx);
3838
}
3939

@@ -236,13 +236,13 @@ bool ValueObjectSynthetic::UpdateValue() {
236236
return true;
237237
}
238238

239-
lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(size_t idx,
239+
lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(uint32_t idx,
240240
bool can_create) {
241241
Log *log = GetLog(LLDBLog::DataFormatters);
242242

243243
LLDB_LOGF(log,
244244
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, retrieving "
245-
"child at index %zu",
245+
"child at index %u",
246246
GetName().AsCString(), idx);
247247

248248
UpdateValueIfNeeded();
@@ -261,15 +261,15 @@ lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(size_t idx,
261261
if (can_create && m_synth_filter_up != nullptr) {
262262
LLDB_LOGF(log,
263263
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at "
264-
"index %zu not cached and will be created",
264+
"index %u not cached and will be created",
265265
GetName().AsCString(), idx);
266266

267267
lldb::ValueObjectSP synth_guy = m_synth_filter_up->GetChildAtIndex(idx);
268268

269269
LLDB_LOGF(
270270
log,
271271
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at index "
272-
"%zu created as %p (is "
272+
"%u created as %p (is "
273273
"synthetic: %s)",
274274
GetName().AsCString(), idx, static_cast<void *>(synth_guy.get()),
275275
synth_guy.get()
@@ -291,7 +291,7 @@ lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(size_t idx,
291291
} else {
292292
LLDB_LOGF(log,
293293
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at "
294-
"index %zu not cached and cannot "
294+
"index %u not cached and cannot "
295295
"be created (can_create = %s, synth_filter = %p)",
296296
GetName().AsCString(), idx, can_create ? "yes" : "no",
297297
static_cast<void *>(m_synth_filter_up.get()));
@@ -301,7 +301,7 @@ lldb::ValueObjectSP ValueObjectSynthetic::GetChildAtIndex(size_t idx,
301301
} else {
302302
LLDB_LOGF(log,
303303
"[ValueObjectSynthetic::GetChildAtIndex] name=%s, child at "
304-
"index %zu cached as %p",
304+
"index %u cached as %p",
305305
GetName().AsCString(), idx, static_cast<void *>(valobj));
306306

307307
return valobj->GetSP();

‎lldb/source/DataFormatters/TypeSynthetic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ ScriptedSyntheticChildren::FrontEnd::FrontEnd(std::string pclass,
167167
ScriptedSyntheticChildren::FrontEnd::~FrontEnd() = default;
168168

169169
lldb::ValueObjectSP
170-
ScriptedSyntheticChildren::FrontEnd::GetChildAtIndex(size_t idx) {
170+
ScriptedSyntheticChildren::FrontEnd::GetChildAtIndex(uint32_t idx) {
171171
if (!m_wrapper_sp || !m_interpreter)
172172
return lldb::ValueObjectSP();
173173

‎lldb/source/DataFormatters/VectorType.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class VectorTypeSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
226226

227227
uint32_t CalculateNumChildren() override { return m_num_children; }
228228

229-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
229+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override {
230230
if (idx >= CalculateNumChildren())
231231
return {};
232232
std::optional<uint64_t> size = m_child_type.GetByteSize(nullptr);

‎lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class BlockPointerSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
7979
return m_block_struct_type.GetNumChildren(omit_empty_base_classes, nullptr);
8080
}
8181

82-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
82+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override {
8383
if (!m_block_struct_type.IsValid()) {
8484
return lldb::ValueObjectSP();
8585
}

‎lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ uint32_t lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
113113
}
114114

115115
lldb::ValueObjectSP lldb_private::formatters::
116-
StdlibCoroutineHandleSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
116+
StdlibCoroutineHandleSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
117117
switch (idx) {
118118
case 0:
119119
return m_resume_ptr_sp;

‎lldb/source/Plugins/Language/CPlusPlus/Coroutines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class StdlibCoroutineHandleSyntheticFrontEnd
3636

3737
uint32_t CalculateNumChildren() override;
3838

39-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
39+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
4040

4141
lldb::ChildCacheState Update() override;
4242

‎lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GenericBitsetFrontEnd : public SyntheticChildrenFrontEnd {
3535
bool MightHaveChildren() override { return true; }
3636
lldb::ChildCacheState Update() override;
3737
uint32_t CalculateNumChildren() override { return m_elements.size(); }
38-
ValueObjectSP GetChildAtIndex(size_t idx) override;
38+
ValueObjectSP GetChildAtIndex(uint32_t idx) override;
3939

4040
private:
4141
llvm::StringRef GetDataContainerMemberName();
@@ -97,7 +97,7 @@ lldb::ChildCacheState GenericBitsetFrontEnd::Update() {
9797
return lldb::ChildCacheState::eRefetch;
9898
}
9999

100-
ValueObjectSP GenericBitsetFrontEnd::GetChildAtIndex(size_t idx) {
100+
ValueObjectSP GenericBitsetFrontEnd::GetChildAtIndex(uint32_t idx) {
101101
if (idx >= m_elements.size() || !m_first)
102102
return ValueObjectSP();
103103

‎lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class GenericOptionalFrontend : public SyntheticChildrenFrontEnd {
4343
bool MightHaveChildren() override { return true; }
4444
uint32_t CalculateNumChildren() override { return m_has_value ? 1U : 0U; }
4545

46-
ValueObjectSP GetChildAtIndex(size_t idx) override;
46+
ValueObjectSP GetChildAtIndex(uint32_t idx) override;
4747
lldb::ChildCacheState Update() override;
4848

4949
private:
@@ -81,7 +81,7 @@ lldb::ChildCacheState GenericOptionalFrontend::Update() {
8181
return lldb::ChildCacheState::eRefetch;
8282
}
8383

84-
ValueObjectSP GenericOptionalFrontend::GetChildAtIndex(size_t _idx) {
84+
ValueObjectSP GenericOptionalFrontend::GetChildAtIndex(uint32_t _idx) {
8585
if (!m_has_value)
8686
return ValueObjectSP();
8787

‎lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ uint32_t lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
358358

359359
lldb::ValueObjectSP
360360
lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::GetChildAtIndex(
361-
size_t idx) {
361+
uint32_t idx) {
362362
if (m_pair_ptr)
363363
return m_pair_ptr->GetChildAtIndex(idx);
364364
if (m_pair_sp)
@@ -515,7 +515,7 @@ uint32_t lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
515515
}
516516

517517
lldb::ValueObjectSP lldb_private::formatters::
518-
LibCxxUnorderedMapIteratorSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
518+
LibCxxUnorderedMapIteratorSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
519519
if (m_pair_sp)
520520
return m_pair_sp->GetChildAtIndex(idx);
521521
return lldb::ValueObjectSP();
@@ -573,7 +573,7 @@ uint32_t lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
573573

574574
lldb::ValueObjectSP
575575
lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::GetChildAtIndex(
576-
size_t idx) {
576+
uint32_t idx) {
577577
if (!m_cntrl)
578578
return lldb::ValueObjectSP();
579579

@@ -670,7 +670,7 @@ uint32_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
670670

671671
lldb::ValueObjectSP
672672
lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::GetChildAtIndex(
673-
size_t idx) {
673+
uint32_t idx) {
674674
if (!m_value_ptr_sp)
675675
return lldb::ValueObjectSP();
676676

‎lldb/source/Plugins/Language/CPlusPlus/LibCxx.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class LibCxxMapIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
8989

9090
uint32_t CalculateNumChildren() override;
9191

92-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
92+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
9393

9494
lldb::ChildCacheState Update() override;
9595

@@ -137,7 +137,7 @@ class LibCxxUnorderedMapIteratorSyntheticFrontEnd
137137

138138
uint32_t CalculateNumChildren() override;
139139

140-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
140+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
141141

142142
lldb::ChildCacheState Update() override;
143143

@@ -168,7 +168,7 @@ class LibcxxSharedPtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
168168

169169
uint32_t CalculateNumChildren() override;
170170

171-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
171+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
172172

173173
lldb::ChildCacheState Update() override;
174174

@@ -188,7 +188,7 @@ class LibcxxUniquePtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
188188

189189
uint32_t CalculateNumChildren() override;
190190

191-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
191+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
192192

193193
lldb::ChildCacheState Update() override;
194194

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class LibcxxStdAtomicSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
9292

9393
uint32_t CalculateNumChildren() override;
9494

95-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
95+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
9696

9797
lldb::ChildCacheState Update() override;
9898

@@ -131,7 +131,7 @@ uint32_t lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
131131

132132
lldb::ValueObjectSP
133133
lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::GetChildAtIndex(
134-
size_t idx) {
134+
uint32_t idx) {
135135
if (idx == 0)
136136
return m_real_child->GetSP()->Clone(ConstString("Value"));
137137
return nullptr;

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class LibcxxInitializerListSyntheticFrontEnd
2828

2929
uint32_t CalculateNumChildren() override;
3030

31-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
31+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
3232

3333
lldb::ChildCacheState Update() override;
3434

@@ -69,7 +69,7 @@ uint32_t lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
6969
}
7070

7171
lldb::ValueObjectSP lldb_private::formatters::
72-
LibcxxInitializerListSyntheticFrontEnd::GetChildAtIndex(size_t idx) {
72+
LibcxxInitializerListSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
7373
if (!m_start)
7474
return lldb::ValueObjectSP();
7575

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class ForwardListFrontEnd : public AbstractListFrontEnd {
137137
ForwardListFrontEnd(ValueObject &valobj);
138138

139139
uint32_t CalculateNumChildren() override;
140-
ValueObjectSP GetChildAtIndex(size_t idx) override;
140+
ValueObjectSP GetChildAtIndex(uint32_t idx) override;
141141
lldb::ChildCacheState Update() override;
142142
};
143143

@@ -149,7 +149,7 @@ class ListFrontEnd : public AbstractListFrontEnd {
149149

150150
uint32_t CalculateNumChildren() override;
151151

152-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
152+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
153153

154154
lldb::ChildCacheState Update() override;
155155

@@ -253,7 +253,7 @@ uint32_t ForwardListFrontEnd::CalculateNumChildren() {
253253
return m_count;
254254
}
255255

256-
ValueObjectSP ForwardListFrontEnd::GetChildAtIndex(size_t idx) {
256+
ValueObjectSP ForwardListFrontEnd::GetChildAtIndex(uint32_t idx) {
257257
if (idx >= CalculateNumChildren())
258258
return nullptr;
259259

@@ -343,7 +343,7 @@ uint32_t ListFrontEnd::CalculateNumChildren() {
343343
}
344344
}
345345

346-
lldb::ValueObjectSP ListFrontEnd::GetChildAtIndex(size_t idx) {
346+
lldb::ValueObjectSP ListFrontEnd::GetChildAtIndex(uint32_t idx) {
347347
static ConstString g_value("__value_");
348348
static ConstString g_next("__next_");
349349

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class LibcxxStdMapSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
179179

180180
uint32_t CalculateNumChildren() override;
181181

182-
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
182+
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
183183

184184
lldb::ChildCacheState Update() override;
185185

@@ -308,7 +308,7 @@ void lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetValueOffset(
308308

309309
lldb::ValueObjectSP
310310
lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::GetChildAtIndex(
311-
size_t idx) {
311+
uint32_t idx) {
312312
static ConstString g_cc_("__cc_"), g_cc("__cc");
313313
static ConstString g_nc("__nc");
314314

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class QueueFrontEnd : public SyntheticChildrenFrontEnd {
3232
return m_container_sp ? m_container_sp->GetNumChildren() : 0;
3333
}
3434

35-
ValueObjectSP GetChildAtIndex(size_t idx) override {
35+
ValueObjectSP GetChildAtIndex(uint32_t idx) override {
3636
return m_container_sp ? m_container_sp->GetChildAtIndex(idx)
3737
: nullptr;
3838
}

0 commit comments

Comments
 (0)