Skip to content

Commit 3d7c5b8

Browse files
adrian-prantladrian-prantl
committed
Change the return type of SyntheticFrontend::CalculateNumChildren to int32_t
This way it is consistent with ValueObject and TypeSystem.
1 parent 54c955b commit 3d7c5b8

34 files changed

+89
-89
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ class SyntheticChildrenFrontEnd {
3838

3939
virtual ~SyntheticChildrenFrontEnd() = default;
4040

41-
virtual size_t CalculateNumChildren() = 0;
41+
virtual uint32_t CalculateNumChildren() = 0;
4242

43-
virtual size_t CalculateNumChildren(uint32_t max) {
43+
virtual uint32_t CalculateNumChildren(uint32_t max) {
4444
auto count = CalculateNumChildren();
4545
return count <= max ? count : max;
4646
}
@@ -109,7 +109,7 @@ class SyntheticValueProviderFrontEnd : public SyntheticChildrenFrontEnd {
109109

110110
~SyntheticValueProviderFrontEnd() override = default;
111111

112-
size_t CalculateNumChildren() override { return 0; }
112+
uint32_t CalculateNumChildren() override { return 0; }
113113

114114
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override { return nullptr; }
115115

@@ -322,7 +322,7 @@ class TypeFilterImpl : public SyntheticChildren {
322322

323323
~FrontEnd() override = default;
324324

325-
size_t CalculateNumChildren() override { return filter->GetCount(); }
325+
uint32_t CalculateNumChildren() override { return filter->GetCount(); }
326326

327327
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
328328
if (idx >= filter->GetCount())
@@ -426,9 +426,9 @@ class ScriptedSyntheticChildren : public SyntheticChildren {
426426

427427
bool IsValid();
428428

429-
size_t CalculateNumChildren() override;
429+
uint32_t CalculateNumChildren() override;
430430

431-
size_t CalculateNumChildren(uint32_t max) override;
431+
uint32_t CalculateNumChildren(uint32_t max) override;
432432

433433
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
434434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class VectorIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
2424
VectorIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp,
2525
llvm::ArrayRef<ConstString> item_names);
2626

27-
size_t CalculateNumChildren() override;
27+
uint32_t CalculateNumChildren() override;
2828

2929
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
3030

‎lldb/source/Core/ValueObjectSyntheticFilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class DummySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
3131
DummySyntheticFrontEnd(ValueObject &backend)
3232
: SyntheticChildrenFrontEnd(backend) {}
3333

34-
size_t CalculateNumChildren() override { return m_backend.GetNumChildren(); }
34+
uint32_t CalculateNumChildren() override { return m_backend.GetNumChildren(); }
3535

3636
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
3737
return m_backend.GetChildAtIndex(idx);

‎lldb/source/DataFormatters/TypeSynthetic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,13 @@ bool ScriptedSyntheticChildren::FrontEnd::IsValid() {
178178
return (m_wrapper_sp && m_wrapper_sp->IsValid() && m_interpreter);
179179
}
180180

181-
size_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren() {
181+
uint32_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren() {
182182
if (!m_wrapper_sp || m_interpreter == nullptr)
183183
return 0;
184184
return m_interpreter->CalculateNumChildren(m_wrapper_sp, UINT32_MAX);
185185
}
186186

187-
size_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren(uint32_t max) {
187+
uint32_t ScriptedSyntheticChildren::FrontEnd::CalculateNumChildren(uint32_t max) {
188188
if (!m_wrapper_sp || m_interpreter == nullptr)
189189
return 0;
190190
return m_interpreter->CalculateNumChildren(m_wrapper_sp, max);

‎lldb/source/DataFormatters/VectorType.cpp

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

225225
~VectorTypeSyntheticFrontEnd() override = default;
226226

227-
size_t CalculateNumChildren() override { return m_num_children; }
227+
uint32_t CalculateNumChildren() override { return m_num_children; }
228228

229229
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override {
230230
if (idx >= CalculateNumChildren())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class BlockPointerSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
7474

7575
~BlockPointerSyntheticFrontEnd() override = default;
7676

77-
size_t CalculateNumChildren() override {
77+
uint32_t CalculateNumChildren() override {
7878
const bool omit_empty_base_classes = false;
7979
return m_block_struct_type.GetNumChildren(omit_empty_base_classes, nullptr);
8080
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
104104
lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
105105
~StdlibCoroutineHandleSyntheticFrontEnd() = default;
106106

107-
size_t lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
107+
uint32_t lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
108108
CalculateNumChildren() {
109109
if (!m_resume_ptr_sp || !m_destroy_ptr_sp)
110110
return 0;

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

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

3535
~StdlibCoroutineHandleSyntheticFrontEnd() override;
3636

37-
size_t CalculateNumChildren() override;
37+
uint32_t CalculateNumChildren() override;
3838

3939
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
4040

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class GenericBitsetFrontEnd : public SyntheticChildrenFrontEnd {
3434

3535
bool MightHaveChildren() override { return true; }
3636
lldb::ChildCacheState Update() override;
37-
size_t CalculateNumChildren() override { return m_elements.size(); }
37+
uint32_t CalculateNumChildren() override { return m_elements.size(); }
3838
ValueObjectSP GetChildAtIndex(size_t idx) override;
3939

4040
private:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class GenericOptionalFrontend : public SyntheticChildrenFrontEnd {
4141
}
4242

4343
bool MightHaveChildren() override { return true; }
44-
size_t CalculateNumChildren() override { return m_has_value ? 1U : 0U; }
44+
uint32_t CalculateNumChildren() override { return m_has_value ? 1U : 0U; }
4545

4646
ValueObjectSP GetChildAtIndex(size_t idx) override;
4747
lldb::ChildCacheState Update() override;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::Update() {
351351
return lldb::ChildCacheState::eRefetch;
352352
}
353353

354-
size_t lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
354+
uint32_t lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
355355
CalculateNumChildren() {
356356
return 2;
357357
}
@@ -509,7 +509,7 @@ lldb::ChildCacheState lldb_private::formatters::
509509
return lldb::ChildCacheState::eRefetch;
510510
}
511511

512-
size_t lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
512+
uint32_t lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
513513
CalculateNumChildren() {
514514
return 2;
515515
}
@@ -566,7 +566,7 @@ lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
566566
Update();
567567
}
568568

569-
size_t lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
569+
uint32_t lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
570570
CalculateNumChildren() {
571571
return (m_cntrl ? 1 : 0);
572572
}
@@ -661,7 +661,7 @@ lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEndCreator(
661661
: nullptr);
662662
}
663663

664-
size_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
664+
uint32_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
665665
CalculateNumChildren() {
666666
if (m_value_ptr_sp)
667667
return m_deleter_sp ? 2 : 1;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class LibCxxMapIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
8787
public:
8888
LibCxxMapIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
8989

90-
size_t CalculateNumChildren() override;
90+
uint32_t CalculateNumChildren() override;
9191

9292
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
9393

@@ -135,7 +135,7 @@ class LibCxxUnorderedMapIteratorSyntheticFrontEnd
135135

136136
~LibCxxUnorderedMapIteratorSyntheticFrontEnd() override = default;
137137

138-
size_t CalculateNumChildren() override;
138+
uint32_t CalculateNumChildren() override;
139139

140140
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
141141

@@ -166,7 +166,7 @@ class LibcxxSharedPtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
166166
public:
167167
LibcxxSharedPtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
168168

169-
size_t CalculateNumChildren() override;
169+
uint32_t CalculateNumChildren() override;
170170

171171
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
172172

@@ -186,7 +186,7 @@ class LibcxxUniquePtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
186186
public:
187187
LibcxxUniquePtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
188188

189-
size_t CalculateNumChildren() override;
189+
uint32_t CalculateNumChildren() override;
190190

191191
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
192192

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

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

9191
~LibcxxStdAtomicSyntheticFrontEnd() override = default;
9292

93-
size_t CalculateNumChildren() override;
93+
uint32_t CalculateNumChildren() override;
9494

9595
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
9696

@@ -124,7 +124,7 @@ bool lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
124124
return true;
125125
}
126126

127-
size_t lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
127+
uint32_t lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
128128
CalculateNumChildren() {
129129
return m_real_child ? 1 : 0;
130130
}

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

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

2727
~LibcxxInitializerListSyntheticFrontEnd() override;
2828

29-
size_t CalculateNumChildren() override;
29+
uint32_t CalculateNumChildren() override;
3030

3131
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
3232

@@ -59,7 +59,7 @@ lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
5959
// delete m_start;
6060
}
6161

62-
size_t lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
62+
uint32_t lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
6363
CalculateNumChildren() {
6464
m_num_elements = 0;
6565
ValueObjectSP size_sp(m_backend.GetChildMemberWithName("__size_"));

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

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

139-
size_t CalculateNumChildren() override;
139+
uint32_t CalculateNumChildren() override;
140140
ValueObjectSP GetChildAtIndex(size_t idx) override;
141141
lldb::ChildCacheState Update() override;
142142
};
@@ -147,7 +147,7 @@ class ListFrontEnd : public AbstractListFrontEnd {
147147

148148
~ListFrontEnd() override = default;
149149

150-
size_t CalculateNumChildren() override;
150+
uint32_t CalculateNumChildren() override;
151151

152152
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
153153

@@ -240,7 +240,7 @@ ForwardListFrontEnd::ForwardListFrontEnd(ValueObject &valobj)
240240
Update();
241241
}
242242

243-
size_t ForwardListFrontEnd::CalculateNumChildren() {
243+
uint32_t ForwardListFrontEnd::CalculateNumChildren() {
244244
if (m_count != UINT32_MAX)
245245
return m_count;
246246

@@ -308,7 +308,7 @@ ListFrontEnd::ListFrontEnd(lldb::ValueObjectSP valobj_sp)
308308
Update();
309309
}
310310

311-
size_t ListFrontEnd::CalculateNumChildren() {
311+
uint32_t ListFrontEnd::CalculateNumChildren() {
312312
if (m_count != UINT32_MAX)
313313
return m_count;
314314
if (!m_head || !m_tail || m_node_address == 0)

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

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

178178
~LibcxxStdMapSyntheticFrontEnd() override = default;
179179

180-
size_t CalculateNumChildren() override;
180+
uint32_t CalculateNumChildren() override;
181181

182182
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
183183

@@ -209,7 +209,7 @@ lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
209209
Update();
210210
}
211211

212-
size_t lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
212+
uint32_t lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
213213
CalculateNumChildren() {
214214
if (m_count != UINT32_MAX)
215215
return m_count;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class QueueFrontEnd : public SyntheticChildrenFrontEnd {
2828
bool MightHaveChildren() override { return true; }
2929
lldb::ChildCacheState Update() override;
3030

31-
size_t CalculateNumChildren() override {
31+
uint32_t CalculateNumChildren() override {
3232
return m_container_sp ? m_container_sp->GetNumChildren() : 0;
3333
}
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class LibcxxStdRangesRefViewSyntheticFrontEnd
2727

2828
~LibcxxStdRangesRefViewSyntheticFrontEnd() override = default;
2929

30-
size_t CalculateNumChildren() override {
30+
uint32_t CalculateNumChildren() override {
3131
// __range_ will be the sole child of this type
3232
return 1;
3333
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class LibcxxStdSpanSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
2727

2828
~LibcxxStdSpanSyntheticFrontEnd() override = default;
2929

30-
size_t CalculateNumChildren() override;
30+
uint32_t CalculateNumChildren() override;
3131

3232
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
3333

@@ -73,7 +73,7 @@ lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
7373
Update();
7474
}
7575

76-
size_t lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
76+
uint32_t lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
7777
CalculateNumChildren() {
7878
return m_num_elements;
7979
}

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

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

2727
bool MightHaveChildren() override { return true; }
2828
lldb::ChildCacheState Update() override;
29-
size_t CalculateNumChildren() override { return m_elements.size(); }
29+
uint32_t CalculateNumChildren() override { return m_elements.size(); }
3030
ValueObjectSP GetChildAtIndex(size_t idx) override;
3131

3232
private:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class LibcxxStdUnorderedMapSyntheticFrontEnd
3333

3434
~LibcxxStdUnorderedMapSyntheticFrontEnd() override = default;
3535

36-
size_t CalculateNumChildren() override;
36+
uint32_t CalculateNumChildren() override;
3737

3838
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
3939

@@ -62,7 +62,7 @@ lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
6262
Update();
6363
}
6464

65-
size_t lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
65+
uint32_t lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
6666
CalculateNumChildren() {
6767
return m_num_elements;
6868
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class LibcxxStdValarraySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
2424

2525
~LibcxxStdValarraySyntheticFrontEnd() override;
2626

27-
size_t CalculateNumChildren() override;
27+
uint32_t CalculateNumChildren() override;
2828

2929
lldb::ValueObjectSP GetChildAtIndex(size_t idx) override;
3030

@@ -63,7 +63,7 @@ lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
6363
// delete m_finish;
6464
}
6565

66-
size_t lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
66+
uint32_t lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
6767
CalculateNumChildren() {
6868
if (!m_start || !m_finish)
6969
return 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class VariantFrontEnd : public SyntheticChildrenFrontEnd {
205205

206206
bool MightHaveChildren() override { return true; }
207207
lldb::ChildCacheState Update() override;
208-
size_t CalculateNumChildren() override { return m_size; }
208+
uint32_t CalculateNumChildren() override { return m_size; }
209209
ValueObjectSP GetChildAtIndex(size_t idx) override;
210210

211211
private:

0 commit comments

Comments
 (0)