Author: David Spickett Date: 2024-01-26T12:21:42Z New Revision: 28ee54c32e6b761e65fd2a7412776f6300ad922b
URL: https://github.com/llvm/llvm-project/commit/28ee54c32e6b761e65fd2a7412776f6300ad922b DIFF: https://github.com/llvm/llvm-project/commit/28ee54c32e6b761e65fd2a7412776f6300ad922b.diff LOG: Revert "[lldb][ObjC][NFC] Fix c++20 gcc compile errors" This reverts commit 5e9f0e37494ab42ff8d850527c5517f3006e63e9 because it creates a new warning from clang: ``` NSDictionary.cpp:1063:14: warning: ISO C++ requires the name after '::~' to be found in the same scope as the name before '::~' [-Wdtor-name] D32, D64>::~GenericNSDictionaryMSyntheticFrontEnd() { ~~~~~~~~~^~ ::GenericNSDictionaryMSyntheticFrontEnd ``` If you remove the template arguments from before the `::`, you then get: ``` NSDictionary.cpp:1062:27: error: use of class template 'lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd' requires template arguments lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd::~GenericNSDictionaryMSyntheticFrontEnd() { ^ ``` And I'm not aware of a way to fix that. Added: Modified: lldb/source/Plugins/Language/ObjC/NSArray.cpp lldb/source/Plugins/Language/ObjC/NSDictionary.cpp lldb/source/Plugins/Language/ObjC/NSSet.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/Language/ObjC/NSArray.cpp b/lldb/source/Plugins/Language/ObjC/NSArray.cpp index 963983c7ffcae12..bd356a61161a537 100644 --- a/lldb/source/Plugins/Language/ObjC/NSArray.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSArray.cpp @@ -548,8 +548,9 @@ lldb_private::formatters::NSArrayMSyntheticFrontEndBase::GetIndexOfChildWithName } template <typename D32, typename D64> -lldb_private::formatters::GenericNSArrayMSyntheticFrontEnd< - D32, D64>::~GenericNSArrayMSyntheticFrontEnd() { +lldb_private::formatters:: + GenericNSArrayMSyntheticFrontEnd<D32, D64>:: + ~GenericNSArrayMSyntheticFrontEnd<D32, D64>() { delete m_data_32; m_data_32 = nullptr; delete m_data_64; @@ -614,8 +615,8 @@ lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>:: } template <typename D32, typename D64, bool Inline> -lldb_private::formatters::GenericNSArrayISyntheticFrontEnd< - D32, D64, Inline>::~GenericNSArrayISyntheticFrontEnd() { +lldb_private::formatters::GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>:: + ~GenericNSArrayISyntheticFrontEnd<D32, D64, Inline>() { delete m_data_32; m_data_32 = nullptr; delete m_data_64; diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp index 18c97dd933b3bf8..5ae0751cb065f32 100644 --- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp @@ -1059,8 +1059,8 @@ lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<D32, D64>:: m_data_32(nullptr), m_data_64(nullptr), m_pair_type() {} template <typename D32, typename D64> -lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd< - D32, D64>::~GenericNSDictionaryMSyntheticFrontEnd() { +lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<D32,D64>:: + ~GenericNSDictionaryMSyntheticFrontEnd<D32,D64>() { delete m_data_32; m_data_32 = nullptr; delete m_data_64; diff --git a/lldb/source/Plugins/Language/ObjC/NSSet.cpp b/lldb/source/Plugins/Language/ObjC/NSSet.cpp index 6917f23b10ca690..44097ee0c42b855 100644 --- a/lldb/source/Plugins/Language/ObjC/NSSet.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSSet.cpp @@ -671,8 +671,8 @@ lldb_private::formatters::GenericNSSetMSyntheticFrontEnd< } template <typename D32, typename D64> -lldb_private::formatters::GenericNSSetMSyntheticFrontEnd< - D32, D64>::~GenericNSSetMSyntheticFrontEnd() { +lldb_private::formatters:: + GenericNSSetMSyntheticFrontEnd<D32, D64>::~GenericNSSetMSyntheticFrontEnd<D32, D64>() { delete m_data_32; m_data_32 = nullptr; delete m_data_64; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
