[Lldb-commits] [PATCH] D142341: [LLDB][NFC] Fix a null pointer check in LibCxx.cpp

Shivam Gupta via Phabricator via lldb-commits Mon, 23 Jan 2023 03:47:17 -0800

xgupta updated this revision to Diff 491288.
xgupta added a comment.

address comments



Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D142341/new/

https://reviews.llvm.org/D142341

Files:
  lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
  lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
  lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
  lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
  lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
  lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
  lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
  lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
  lldb/source/Plugins/Language/ObjC/NSArray.cpp
  lldb/source/Plugins/Language/ObjC/NSSet.cpp

Index: lldb/source/Plugins/Language/ObjC/NSSet.cpp
===================================================================
--- lldb/source/Plugins/Language/ObjC/NSSet.cpp
+++ lldb/source/Plugins/Language/ObjC/NSSet.cpp
@@ -401,8 +401,9 @@
 
 lldb_private::formatters::NSSetISyntheticFrontEnd::NSSetISyntheticFrontEnd(
     lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref() {
+    : m_exe_ctx_ref() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
@@ -668,9 +669,9 @@
 template <typename D32, typename D64>
 lldb_private::formatters::GenericNSSetMSyntheticFrontEnd<
     D32, D64>::GenericNSSetMSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(),
-      m_data_32(nullptr), m_data_64(nullptr) {
+    : m_exe_ctx_ref(), m_data_32(nullptr), m_data_64(nullptr) {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
Index: lldb/source/Plugins/Language/ObjC/NSArray.cpp
===================================================================
--- lldb/source/Plugins/Language/ObjC/NSArray.cpp
+++ lldb/source/Plugins/Language/ObjC/NSArray.cpp
@@ -461,8 +461,9 @@
 
 lldb_private::formatters::NSArrayMSyntheticFrontEndBase::
     NSArrayMSyntheticFrontEndBase(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(), m_id_type() {
+    : m_exe_ctx_ref(), m_id_type() {
   if (valobj_sp) {
+    SyntheticChildrenFrontEnd(*valobj_sp);
     TypeSystemClangSP scratch_ts_sp = ScratchTypeSystemClang::GetForTarget(
         *valobj_sp->GetExecutionContextRef().GetTargetSP());
     if (scratch_ts_sp)
@@ -604,9 +605,9 @@
 template <typename D32, typename D64, bool Inline>
 lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>::
     GenericNSArrayISyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(),
-      m_data_32(nullptr), m_data_64(nullptr) {
+    : m_exe_ctx_ref(), m_data_32(nullptr), m_data_64(nullptr) {
   if (valobj_sp) {
+    SyntheticChildrenFrontEnd(*valobj_sp);
     CompilerType type = valobj_sp->GetCompilerType();
     if (type) {
       TypeSystemClangSP scratch_ts_sp = ScratchTypeSystemClang::GetForTarget(
Index: lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp
@@ -79,9 +79,10 @@
 
 LibstdcppMapIteratorSyntheticFrontEnd::LibstdcppMapIteratorSyntheticFrontEnd(
     lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(), m_pair_type(),
+    : m_exe_ctx_ref(), m_pair_type(),
       m_pair_sp() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
@@ -179,9 +180,9 @@
 lldb_private::formatters::VectorIteratorSyntheticFrontEnd::
     VectorIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp,
                                     llvm::ArrayRef<ConstString> item_names)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_exe_ctx_ref(),
-      m_item_names(item_names), m_item_sp() {
+    : m_exe_ctx_ref(), m_item_names(item_names), m_item_sp() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
@@ -350,9 +351,9 @@
 }
 
 LibStdcppSharedPtrSyntheticFrontEnd::LibStdcppSharedPtrSyntheticFrontEnd(
-    lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp) {
+    lldb::ValueObjectSP valobj_sp) {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
@@ -69,8 +69,9 @@
 
 lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::
     LibcxxStdVectorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_element_type() {
+    : m_element_type() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
@@ -172,9 +173,9 @@
 
 lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
     LibcxxVectorBoolSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_bool_type(), m_exe_ctx_ref(),
-      m_children() {
+    : m_bool_type(), m_exe_ctx_ref(), m_children() {
   if (valobj_sp) {
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
     m_bool_type =
         valobj_sp->GetCompilerType().GetBasicTypeFromAST(lldb::eBasicTypeBool);
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
@@ -56,9 +56,9 @@
 
 lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::
     LibcxxStdUnorderedMapSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_element_type(),
-      m_elements_cache() {
+    : m_element_type(), m_elements_cache() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxxSpan.cpp
@@ -67,9 +67,9 @@
 };
 
 lldb_private::formatters::LibcxxStdSpanSyntheticFrontEnd::
-    LibcxxStdSpanSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp) {
+    LibcxxStdSpanSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp) {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
@@ -204,8 +204,9 @@
 
 lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
     LibcxxStdMapSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_element_type(), m_iterators() {
+    : m_element_type(), m_iterators() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
@@ -307,9 +307,9 @@
   return false;
 }
 
-ListFrontEnd::ListFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : AbstractListFrontEnd(*valobj_sp) {
+ListFrontEnd::ListFrontEnd(lldb::ValueObjectSP valobj_sp) {
   if (valobj_sp)
+    AbstractListFrontEnd(*valobj_sp);
     Update();
 }
 
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
@@ -47,8 +47,9 @@
 
 lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
     LibcxxInitializerListSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_element_type() {
+    : m_element_type() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
@@ -220,8 +220,9 @@
 
 lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
     LibCxxMapIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_pair_ptr(), m_pair_sp() {
+    : m_pair_ptr(), m_pair_sp() {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
@@ -389,9 +390,9 @@
 }
 
 lldb_private::formatters::LibCxxUnorderedMapIteratorSyntheticFrontEnd::
-    LibCxxUnorderedMapIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp) {
+    LibCxxUnorderedMapIteratorSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp) {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
@@ -557,8 +558,9 @@
 
 lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
     LibcxxSharedPtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp), m_cntrl(nullptr) {
+    : m_cntrl(nullptr) {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }
 
@@ -640,9 +642,9 @@
 }
 
 lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
-    LibcxxUniquePtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp)
-    : SyntheticChildrenFrontEnd(*valobj_sp) {
+    LibcxxUniquePtrSyntheticFrontEnd(lldb::ValueObjectSP valobj_sp) {
   if (valobj_sp)
+    SyntheticChildrenFrontEnd(*valobj_sp);
     Update();
 }

_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D142341: [LLDB][NFC] Fix a null pointer check in LibCxx.cpp

Reply via email to