[Lldb-commits] [lldb] [lldb] Provide default impl for MightHaveChildren (NFC) (PR #119977)
Dave Lee via lldb-commits
lldb-commits at lists.llvm.org
Mon Dec 16 11:08:10 PST 2024
https://github.com/kastiglione updated https://github.com/llvm/llvm-project/pull/119977
>From 3bf901b53d98378cee4a1868d039a1289e9e5277 Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee.com at gmail.com>
Date: Sat, 14 Dec 2024 09:26:17 -0800
Subject: [PATCH 1/3] [lldb] Provide default impl for MightHaveChildren (NFC)
---
.../lldb/DataFormatters/TypeSynthetic.h | 2 +-
.../lldb/DataFormatters/VectorIterator.h | 2 -
lldb/source/DataFormatters/VectorType.cpp | 2 -
.../Language/CPlusPlus/BlockPointer.cpp | 3 --
.../Plugins/Language/CPlusPlus/Coroutines.cpp | 5 ---
.../Plugins/Language/CPlusPlus/Coroutines.h | 2 -
.../Language/CPlusPlus/GenericBitset.cpp | 1 -
.../Language/CPlusPlus/GenericOptional.cpp | 1 -
.../Plugins/Language/CPlusPlus/LibCxx.cpp | 10 -----
.../Plugins/Language/CPlusPlus/LibCxx.h | 4 --
.../Language/CPlusPlus/LibCxxAtomic.cpp | 7 ---
.../CPlusPlus/LibCxxInitializerList.cpp | 7 ---
.../Plugins/Language/CPlusPlus/LibCxxList.cpp | 1 -
.../Plugins/Language/CPlusPlus/LibCxxMap.cpp | 14 ------
.../Language/CPlusPlus/LibCxxProxyArray.cpp | 7 ---
.../Language/CPlusPlus/LibCxxQueue.cpp | 1 -
.../CPlusPlus/LibCxxRangesRefView.cpp | 2 -
.../Language/CPlusPlus/LibCxxSliceArray.cpp | 7 ---
.../Plugins/Language/CPlusPlus/LibCxxSpan.cpp | 7 ---
.../Language/CPlusPlus/LibCxxTuple.cpp | 1 -
.../Language/CPlusPlus/LibCxxUnorderedMap.cpp | 14 ------
.../Language/CPlusPlus/LibCxxValarray.cpp | 7 ---
.../Language/CPlusPlus/LibCxxVariant.cpp | 1 -
.../Language/CPlusPlus/LibCxxVector.cpp | 9 ----
.../Plugins/Language/CPlusPlus/LibStdcpp.cpp | 10 -----
.../Language/CPlusPlus/LibStdcppTuple.cpp | 4 --
.../CPlusPlus/LibStdcppUniquePointer.cpp | 4 --
lldb/source/Plugins/Language/ObjC/NSArray.cpp | 22 ---------
.../Plugins/Language/ObjC/NSDictionary.cpp | 45 -------------------
lldb/source/Plugins/Language/ObjC/NSError.cpp | 2 -
.../Plugins/Language/ObjC/NSException.cpp | 2 -
lldb/source/Plugins/Language/ObjC/NSSet.cpp | 37 ---------------
32 files changed, 1 insertion(+), 242 deletions(-)
diff --git a/lldb/include/lldb/DataFormatters/TypeSynthetic.h b/lldb/include/lldb/DataFormatters/TypeSynthetic.h
index bf6dc6a0c3c6bf..14e516964f2507 100644
--- a/lldb/include/lldb/DataFormatters/TypeSynthetic.h
+++ b/lldb/include/lldb/DataFormatters/TypeSynthetic.h
@@ -68,7 +68,7 @@ class SyntheticChildrenFrontEnd {
// a false return value from this call if it returns true, then
// CalculateNumChildren() can return any number >= 0 (0 being valid) it
// should if at all possible be more efficient than CalculateNumChildren()
- virtual bool MightHaveChildren() = 0;
+ virtual bool MightHaveChildren() { return true; }
// if this function returns a non-null ValueObject, then the returned
// ValueObject will stand for this ValueObject whenever a "value" request is
diff --git a/lldb/include/lldb/DataFormatters/VectorIterator.h b/lldb/include/lldb/DataFormatters/VectorIterator.h
index 70bcf50ca1b1d2..d095f085cabab6 100644
--- a/lldb/include/lldb/DataFormatters/VectorIterator.h
+++ b/lldb/include/lldb/DataFormatters/VectorIterator.h
@@ -30,8 +30,6 @@ class VectorIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
diff --git a/lldb/source/DataFormatters/VectorType.cpp b/lldb/source/DataFormatters/VectorType.cpp
index cba107b7da8900..fa3fb1b674efbe 100644
--- a/lldb/source/DataFormatters/VectorType.cpp
+++ b/lldb/source/DataFormatters/VectorType.cpp
@@ -268,8 +268,6 @@ class VectorTypeSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
return lldb::ChildCacheState::eRefetch;
}
- bool MightHaveChildren() override { return true; }
-
size_t GetIndexOfChildWithName(ConstString name) override {
const char *item_name = name.GetCString();
uint32_t idx = ExtractIndexFromString(item_name);
diff --git a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
index d7d4654a6b5f44..6a22501c98aab8 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/BlockPointer.cpp
@@ -144,9 +144,6 @@ class BlockPointerSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
return lldb::ChildCacheState::eRefetch;
}
- // maybe return false if the block pointer is, say, null
- bool MightHaveChildren() override { return true; }
-
size_t GetIndexOfChildWithName(ConstString name) override {
if (!m_block_struct_type.IsValid())
return UINT32_MAX;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
index 5e63d1d7b21453..76a10d2393782c 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.cpp
@@ -199,11 +199,6 @@ lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::StdlibCoroutineHandleSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
ConstString name) {
if (!m_resume_ptr_sp || !m_destroy_ptr_sp)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
index f9765f3255d2b8..c33c82bd2fc455 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/Coroutines.h
@@ -40,8 +40,6 @@ class StdlibCoroutineHandleSyntheticFrontEnd
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
index 33955dccb6ccc3..f83f81fbdd1e72 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/GenericBitset.cpp
@@ -32,7 +32,6 @@ class GenericBitsetFrontEnd : public SyntheticChildrenFrontEnd {
return formatters::ExtractIndexFromString(name.GetCString());
}
- bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
llvm::Expected<uint32_t> CalculateNumChildren() override {
return m_elements.size();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
index a8a7c16de5e867..b224d3e859c84f 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/GenericOptional.cpp
@@ -42,7 +42,6 @@ class GenericOptionalFrontend : public SyntheticChildrenFrontEnd {
return formatters::ExtractIndexFromString(name.GetCString());
}
- bool MightHaveChildren() override { return true; }
llvm::Expected<uint32_t> CalculateNumChildren() override {
return m_has_value ? 1U : 0U;
}
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
index 6d0ccdbbe4a71d..7e38d09dac7f67 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
@@ -309,11 +309,6 @@ lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (name == "__ptr_")
@@ -412,11 +407,6 @@ lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (name == "pointer")
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
index cb9ceaf0933000..21fbb361eb9342 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
@@ -102,8 +102,6 @@ class LibcxxSharedPtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
~LibcxxSharedPtrSyntheticFrontEnd() override;
@@ -122,8 +120,6 @@ class LibcxxUniquePtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
~LibcxxUniquePtrSyntheticFrontEnd() override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
index 7f30dc186291e9..3104f33ee80b3a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
@@ -96,8 +96,6 @@ class LibcxxStdAtomicSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -119,11 +117,6 @@ lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
llvm::Expected<uint32_t> lldb_private::formatters::
LibcxxStdAtomicSyntheticFrontEnd::CalculateNumChildren() {
return m_real_child ? 1 : 0;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
index 67c6d1d3e55060..cd13455a2e4608 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
@@ -32,8 +32,6 @@ class LibcxxInitializerListSyntheticFrontEnd
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -99,11 +97,6 @@ lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (!m_start)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
index f33b148249ab98..ae1ad2bfe72000 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
@@ -109,7 +109,6 @@ class AbstractListFrontEnd : public SyntheticChildrenFrontEnd {
size_t GetIndexOfChildWithName(ConstString name) override {
return ExtractIndexFromString(name.GetCString());
}
- bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
protected:
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
index ebaf60a16b069b..d75f25f49fdb4a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
@@ -197,8 +197,6 @@ class LibcxxStdMapSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -237,8 +235,6 @@ class LibCxxMapIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
~LibCxxMapIteratorSyntheticFrontEnd() override = default;
@@ -397,11 +393,6 @@ lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
return ExtractIndexFromString(name.GetCString());
@@ -497,11 +488,6 @@ lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::GetChildAtIndex(
return m_pair_sp->GetChildAtIndex(idx);
}
-bool lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (!m_pair_sp)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp
index c659adbb9ab2e3..fdb8f07ec4006b 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp
@@ -41,8 +41,6 @@ class LibcxxStdProxyArraySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -173,11 +171,6 @@ lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd::Update() {
return ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (!m_base)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
index 5b459a17fe29ba..8f1e35b3bede91 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxQueue.cpp
@@ -25,7 +25,6 @@ class QueueFrontEnd : public SyntheticChildrenFrontEnd {
: UINT32_MAX;
}
- bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
llvm::Expected<uint32_t> CalculateNumChildren() override {
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
index f3fe56525789a5..e8ab37a022fbc5 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxRangesRefView.cpp
@@ -40,8 +40,6 @@ class LibcxxStdRangesRefViewSyntheticFrontEnd
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override { return true; }
-
size_t GetIndexOfChildWithName(ConstString name) override {
// We only have a single child
return 0;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp
index 5d607709d2c6f8..523a7ab1001ecd 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSliceArray.cpp
@@ -62,8 +62,6 @@ class LibcxxStdSliceArraySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -145,11 +143,6 @@ lldb_private::formatters::LibcxxStdSliceArraySyntheticFrontEnd::Update() {
return ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxStdSliceArraySyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxStdSliceArraySyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (!m_start)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
index 15040295efe6de..ab3a5cf954ec76 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
@@ -55,8 +55,6 @@ class LibcxxStdSpanSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
// from the only other place it can be: the template argument.
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -126,11 +124,6 @@ lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eReuse;
}
-bool lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (!m_start)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
index 3e3259ab428df3..263ca8349b891a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxTuple.cpp
@@ -24,7 +24,6 @@ class TupleFrontEnd: public SyntheticChildrenFrontEnd {
return formatters::ExtractIndexFromString(name.GetCString());
}
- bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
llvm::Expected<uint32_t> CalculateNumChildren() override {
return m_elements.size();
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
index bf91fc42482f3f..bb96774d255355 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
@@ -40,8 +40,6 @@ class LibcxxStdUnorderedMapSyntheticFrontEnd
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -70,8 +68,6 @@ class LibCxxUnorderedMapIteratorSyntheticFrontEnd
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -294,11 +290,6 @@ lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
return ExtractIndexFromString(name.GetCString());
@@ -406,11 +397,6 @@ lldb::ValueObjectSP lldb_private::formatters::
return lldb::ValueObjectSP();
}
-bool lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (name == "first")
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
index 3f519f8c585f55..18c9c9b0e8710a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxValarray.cpp
@@ -30,8 +30,6 @@ class LibcxxStdValarraySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -124,11 +122,6 @@ lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::Update() {
return ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxStdValarraySyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (!m_start || !m_finish)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
index 62794318e0777c..c3cb1fdcb42518 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVariant.cpp
@@ -203,7 +203,6 @@ class VariantFrontEnd : public SyntheticChildrenFrontEnd {
return formatters::ExtractIndexFromString(name.GetCString());
}
- bool MightHaveChildren() override { return true; }
lldb::ChildCacheState Update() override;
llvm::Expected<uint32_t> CalculateNumChildren() override { return m_size; }
ValueObjectSP GetChildAtIndex(uint32_t idx) override;
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
index b762379a07d3a1..ae3ed6326b45fc 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
@@ -33,8 +33,6 @@ class LibcxxStdVectorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -54,8 +52,6 @@ class LibcxxVectorBoolSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override { return true; }
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -153,11 +149,6 @@ lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
size_t lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
GetIndexOfChildWithName(ConstString name) {
if (!m_start || !m_finish)
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
index 0a1877471916de..127c0cd6666a8d 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
@@ -49,8 +49,6 @@ class LibstdcppMapIteratorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -70,8 +68,6 @@ class LibStdcppSharedPtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -149,8 +145,6 @@ LibstdcppMapIteratorSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
return lldb::ValueObjectSP();
}
-bool LibstdcppMapIteratorSyntheticFrontEnd::MightHaveChildren() { return true; }
-
size_t LibstdcppMapIteratorSyntheticFrontEnd::GetIndexOfChildWithName(
ConstString name) {
if (name == "first")
@@ -232,8 +226,6 @@ VectorIteratorSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
return lldb::ValueObjectSP();
}
-bool VectorIteratorSyntheticFrontEnd::MightHaveChildren() { return true; }
-
size_t VectorIteratorSyntheticFrontEnd::GetIndexOfChildWithName(
ConstString name) {
if (name == "item")
@@ -416,8 +408,6 @@ lldb::ChildCacheState LibStdcppSharedPtrSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool LibStdcppSharedPtrSyntheticFrontEnd::MightHaveChildren() { return true; }
-
size_t LibStdcppSharedPtrSyntheticFrontEnd::GetIndexOfChildWithName(
ConstString name) {
if (name == "pointer")
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
index f59969d4cd7a14..68133b202a0c86 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
@@ -32,8 +32,6 @@ class LibStdcppTupleSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -86,8 +84,6 @@ lldb::ChildCacheState LibStdcppTupleSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool LibStdcppTupleSyntheticFrontEnd::MightHaveChildren() { return true; }
-
lldb::ValueObjectSP
LibStdcppTupleSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
if (idx < m_members.size() && m_members[idx])
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
index 9447f7463f64ae..209aaced23c7d3 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
@@ -32,8 +32,6 @@ class LibStdcppUniquePtrSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
bool GetSummary(Stream &stream, const TypeSummaryOptions &options);
@@ -113,8 +111,6 @@ lldb::ChildCacheState LibStdcppUniquePtrSyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool LibStdcppUniquePtrSyntheticFrontEnd::MightHaveChildren() { return true; }
-
lldb::ValueObjectSP
LibStdcppUniquePtrSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
if (idx == 0 && m_ptr_obj)
diff --git a/lldb/source/Plugins/Language/ObjC/NSArray.cpp b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
index 072b8b5a6c8608..7054dd8ffa9524 100644
--- a/lldb/source/Plugins/Language/ObjC/NSArray.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
@@ -56,8 +56,6 @@ class NSArrayMSyntheticFrontEndBase : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override = 0;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
protected:
@@ -220,8 +218,6 @@ class GenericNSArrayISyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -325,8 +321,6 @@ class NSArray1SyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
};
} // namespace formatters
@@ -532,11 +526,6 @@ lldb_private::formatters::GenericNSArrayMSyntheticFrontEnd<D32, D64>::Update() {
: lldb::ChildCacheState::eRefetch;
}
-bool
-lldb_private::formatters::NSArrayMSyntheticFrontEndBase::MightHaveChildren() {
- return true;
-}
-
size_t
lldb_private::formatters::NSArrayMSyntheticFrontEndBase::GetIndexOfChildWithName(
ConstString name) {
@@ -674,13 +663,6 @@ lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64,
: lldb::ChildCacheState::eRefetch;
}
-template <typename D32, typename D64, bool Inline>
-bool
-lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
- MightHaveChildren() {
- return true;
-}
-
template <typename D32, typename D64, bool Inline>
lldb::ValueObjectSP
lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
@@ -764,10 +746,6 @@ lldb_private::formatters::NSArray1SyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::NSArray1SyntheticFrontEnd::MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP
lldb_private::formatters::NSArray1SyntheticFrontEnd::GetChildAtIndex(
uint32_t idx) {
diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
index cf8750fd4976e3..008e8eb569f010 100644
--- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
@@ -109,8 +109,6 @@ class NSDictionaryISyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -150,8 +148,6 @@ class NSConstantDictionarySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -182,8 +178,6 @@ class NSCFDictionarySyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -215,8 +209,6 @@ class NSDictionary1SyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -236,8 +228,6 @@ class GenericNSDictionaryMSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -269,8 +259,6 @@ namespace Foundation1100 {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -648,11 +636,6 @@ lldb_private::formatters::NSDictionaryISyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::NSDictionaryISyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP
lldb_private::formatters::NSDictionaryISyntheticFrontEnd::GetChildAtIndex(
uint32_t idx) {
@@ -770,11 +753,6 @@ lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::Update() {
: lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP
lldb_private::formatters::NSCFDictionarySyntheticFrontEnd::GetChildAtIndex(
uint32_t idx) {
@@ -914,11 +892,6 @@ lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::Update() {
: lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP lldb_private::formatters::
NSConstantDictionarySyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
uint32_t num_children = CalculateNumChildrenIgnoringErrors();
@@ -1005,11 +978,6 @@ lldb_private::formatters::NSDictionary1SyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::NSDictionary1SyntheticFrontEnd::
- MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP
lldb_private::formatters::NSDictionary1SyntheticFrontEnd::GetChildAtIndex(
uint32_t idx) {
@@ -1131,13 +1099,6 @@ lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<D32,
: lldb::ChildCacheState::eRefetch;
}
-template <typename D32, typename D64>
-bool
-lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<D32,D64>::
- MightHaveChildren() {
- return true;
-}
-
template <typename D32, typename D64>
lldb::ValueObjectSP
lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
@@ -1292,12 +1253,6 @@ lldb::ChildCacheState lldb_private::formatters::Foundation1100::
: lldb::ChildCacheState::eRefetch;
}
-bool
-lldb_private::formatters::Foundation1100::
- NSDictionaryMSyntheticFrontEnd::MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP
lldb_private::formatters::Foundation1100::
NSDictionaryMSyntheticFrontEnd::GetChildAtIndex(uint32_t idx) {
diff --git a/lldb/source/Plugins/Language/ObjC/NSError.cpp b/lldb/source/Plugins/Language/ObjC/NSError.cpp
index 2356bc4ef4babd..7fad79a55eda35 100644
--- a/lldb/source/Plugins/Language/ObjC/NSError.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSError.cpp
@@ -165,8 +165,6 @@ class NSErrorSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
return lldb::ChildCacheState::eRefetch;
}
- bool MightHaveChildren() override { return true; }
-
size_t GetIndexOfChildWithName(ConstString name) override {
static ConstString g_userInfo("_userInfo");
if (name == g_userInfo)
diff --git a/lldb/source/Plugins/Language/ObjC/NSException.cpp b/lldb/source/Plugins/Language/ObjC/NSException.cpp
index b7d42bc5745e3a..67f3f1779e1475 100644
--- a/lldb/source/Plugins/Language/ObjC/NSException.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSException.cpp
@@ -148,8 +148,6 @@ class NSExceptionSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
: lldb::ChildCacheState::eRefetch;
}
- bool MightHaveChildren() override { return true; }
-
size_t GetIndexOfChildWithName(ConstString name) override {
// NSException has 4 members:
// NSString *name;
diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
index a184ec624b63e1..719e35ee41c3e5 100644
--- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
@@ -52,8 +52,6 @@ class NSSetISyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -90,8 +88,6 @@ class NSCFSetSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -123,8 +119,6 @@ class GenericNSSetMSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
lldb::ChildCacheState Update() override;
- bool MightHaveChildren() override;
-
size_t GetIndexOfChildWithName(ConstString name) override;
private:
@@ -227,22 +221,6 @@ namespace Foundation1437 {
}
}
-class NSSetCodeRunningSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
-public:
- NSSetCodeRunningSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp);
-
- ~NSSetCodeRunningSyntheticFrontEnd() override;
-
- llvm::Expected<uint32_t> CalculateNumChildren() override;
-
- lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override;
-
- lldb::ChildCacheState Update() override;
-
- bool MightHaveChildren() override;
-
- size_t GetIndexOfChildWithName(ConstString name) override;
-};
} // namespace formatters
} // namespace lldb_private
@@ -461,10 +439,6 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::Update() {
return lldb::ChildCacheState::eReuse;
}
-bool lldb_private::formatters::NSSetISyntheticFrontEnd::MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP
lldb_private::formatters::NSSetISyntheticFrontEnd::GetChildAtIndex(
uint32_t idx) {
@@ -582,10 +556,6 @@ lldb_private::formatters::NSCFSetSyntheticFrontEnd::Update() {
: lldb::ChildCacheState::eRefetch;
}
-bool lldb_private::formatters::NSCFSetSyntheticFrontEnd::MightHaveChildren() {
- return true;
-}
-
lldb::ValueObjectSP
lldb_private::formatters::NSCFSetSyntheticFrontEnd::GetChildAtIndex(
uint32_t idx) {
@@ -739,13 +709,6 @@ lldb_private::formatters::GenericNSSetMSyntheticFrontEnd<D32, D64>::Update() {
: lldb::ChildCacheState::eRefetch;
}
-template <typename D32, typename D64>
-bool
-lldb_private::formatters::
- GenericNSSetMSyntheticFrontEnd<D32, D64>::MightHaveChildren() {
- return true;
-}
-
template <typename D32, typename D64>
lldb::ValueObjectSP
lldb_private::formatters::
>From 4b76ed11ce25de0cc3117bfebd840fa8184fb744 Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee.com at gmail.com>
Date: Sat, 14 Dec 2024 10:04:52 -0800
Subject: [PATCH 2/3] Fix formatting
---
lldb/source/Plugins/Language/ObjC/NSSet.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
index 719e35ee41c3e5..717fe6b037ea69 100644
--- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
@@ -220,7 +220,6 @@ namespace Foundation1437 {
}
}
}
-
} // namespace formatters
} // namespace lldb_private
>From e1d0a3ed2c0bdb8d0063c6a1cb85648190f94c4c Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee.com at gmail.com>
Date: Mon, 16 Dec 2024 11:07:35 -0800
Subject: [PATCH 3/3] Another format
---
lldb/source/Plugins/Language/ObjC/NSSet.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
index 717fe6b037ea69..55069495676e57 100644
--- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp
@@ -219,7 +219,7 @@ namespace Foundation1437 {
return __NSSetMSize_Impl<DataDescriptor_64>(process, valobj_addr, error);
}
}
-}
+ } // namespace Foundation1437
} // namespace formatters
} // namespace lldb_private
More information about the lldb-commits
mailing list