Fix Clang-tidy modernize-use-override warnings in source/Plugins/Language; other minor fixes.
Differential Revision: http://reviews.llvm.org/D13876
llvm-svn: 250789
diff --git a/lldb/source/Plugins/Language/ObjC/NSArray.cpp b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
index 675a91a..ccc82ab 100644
--- a/lldb/source/Plugins/Language/ObjC/NSArray.cpp
+++ b/lldb/source/Plugins/Language/ObjC/NSArray.cpp
@@ -7,6 +7,12 @@
//
//===----------------------------------------------------------------------===//
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+#include "clang/AST/ASTContext.h"
+
+// Project includes
#include "Cocoa.h"
#include "lldb/Core/DataBufferHeap.h"
@@ -23,8 +29,6 @@
#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h"
#include "lldb/Target/Target.h"
-#include "clang/AST/ASTContext.h"
-
using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::formatters;
@@ -35,24 +39,23 @@
{
public:
NSArrayMSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~NSArrayMSyntheticFrontEnd() override = default;
+
+ size_t
+ CalculateNumChildren() override;
- virtual size_t
- CalculateNumChildren ();
+ lldb::ValueObjectSP
+ GetChildAtIndex(size_t idx) override;
- virtual lldb::ValueObjectSP
- GetChildAtIndex (size_t idx);
+ bool
+ Update() override = 0;
- virtual bool
- Update() = 0;
+ bool
+ MightHaveChildren() override;
- virtual bool
- MightHaveChildren ();
-
- virtual size_t
- GetIndexOfChildWithName (const ConstString &name);
-
- virtual
- ~NSArrayMSyntheticFrontEnd () {}
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
protected:
virtual lldb::addr_t
@@ -75,6 +78,27 @@
class NSArrayMSyntheticFrontEnd_109 : public NSArrayMSyntheticFrontEnd
{
+ public:
+ NSArrayMSyntheticFrontEnd_109 (lldb::ValueObjectSP valobj_sp);
+
+ ~NSArrayMSyntheticFrontEnd_109() override;
+
+ bool
+ Update() override;
+
+ protected:
+ lldb::addr_t
+ GetDataAddress() override;
+
+ uint64_t
+ GetUsedCount() override;
+
+ uint64_t
+ GetOffset() override;
+
+ uint64_t
+ GetSize() override;
+
private:
struct DataDescriptor_32
{
@@ -86,6 +110,7 @@
uint32_t _priv3;
uint32_t _data;
};
+
struct DataDescriptor_64
{
uint64_t _used;
@@ -96,35 +121,34 @@
uint32_t _priv3;
uint64_t _data;
};
- public:
- NSArrayMSyntheticFrontEnd_109 (lldb::ValueObjectSP valobj_sp);
-
- virtual bool
- Update();
-
- virtual
- ~NSArrayMSyntheticFrontEnd_109 ();
-
- protected:
- virtual lldb::addr_t
- GetDataAddress ();
-
- virtual uint64_t
- GetUsedCount ();
-
- virtual uint64_t
- GetOffset ();
-
- virtual uint64_t
- GetSize ();
-
- private:
+
DataDescriptor_32 *m_data_32;
DataDescriptor_64 *m_data_64;
};
class NSArrayMSyntheticFrontEnd_1010 : public NSArrayMSyntheticFrontEnd
{
+ public:
+ NSArrayMSyntheticFrontEnd_1010 (lldb::ValueObjectSP valobj_sp);
+
+ ~NSArrayMSyntheticFrontEnd_1010() override;
+
+ bool
+ Update() override;
+
+ protected:
+ lldb::addr_t
+ GetDataAddress() override;
+
+ uint64_t
+ GetUsedCount() override;
+
+ uint64_t
+ GetOffset() override;
+
+ uint64_t
+ GetSize() override;
+
private:
struct DataDescriptor_32
{
@@ -135,6 +159,7 @@
uint32_t _priv2;
uint32_t _data;
};
+
struct DataDescriptor_64
{
uint64_t _used;
@@ -144,29 +169,7 @@
uint32_t _priv2;
uint64_t _data;
};
- public:
- NSArrayMSyntheticFrontEnd_1010 (lldb::ValueObjectSP valobj_sp);
-
- virtual bool
- Update();
-
- virtual
- ~NSArrayMSyntheticFrontEnd_1010 ();
-
- protected:
- virtual lldb::addr_t
- GetDataAddress ();
-
- virtual uint64_t
- GetUsedCount ();
-
- virtual uint64_t
- GetOffset ();
-
- virtual uint64_t
- GetSize ();
-
- private:
+
DataDescriptor_32 *m_data_32;
DataDescriptor_64 *m_data_64;
};
@@ -175,24 +178,24 @@
{
public:
NSArrayISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~NSArrayISyntheticFrontEnd() override = default;
+
+ size_t
+ CalculateNumChildren() override;
- virtual size_t
- CalculateNumChildren ();
+ lldb::ValueObjectSP
+ GetChildAtIndex(size_t idx) override;
- virtual lldb::ValueObjectSP
- GetChildAtIndex (size_t idx);
+ bool
+ Update() override;
- virtual bool
- Update();
+ bool
+ MightHaveChildren() override;
- virtual bool
- MightHaveChildren ();
-
- virtual size_t
- GetIndexOfChildWithName (const ConstString &name);
-
- virtual
- ~NSArrayISyntheticFrontEnd ();
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
+
private:
ExecutionContextRef m_exe_ctx_ref;
uint8_t m_ptr_size;
@@ -206,52 +209,49 @@
{
public:
NSArray0SyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~NSArray0SyntheticFrontEnd() override = default;
+
+ size_t
+ CalculateNumChildren() override;
- virtual size_t
- CalculateNumChildren ();
+ lldb::ValueObjectSP
+ GetChildAtIndex(size_t idx) override;
- virtual lldb::ValueObjectSP
- GetChildAtIndex (size_t idx);
+ bool
+ Update() override;
- virtual bool
- Update();
+ bool
+ MightHaveChildren() override;
- virtual bool
- MightHaveChildren ();
-
- virtual size_t
- GetIndexOfChildWithName (const ConstString &name);
-
- virtual
- ~NSArray0SyntheticFrontEnd ();
- private:
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
};
class NSArrayCodeRunningSyntheticFrontEnd : public SyntheticChildrenFrontEnd
{
public:
NSArrayCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~NSArrayCodeRunningSyntheticFrontEnd() override = default;
+
+ size_t
+ CalculateNumChildren() override;
- virtual size_t
- CalculateNumChildren ();
+ lldb::ValueObjectSP
+ GetChildAtIndex(size_t idx) override;
- virtual lldb::ValueObjectSP
- GetChildAtIndex (size_t idx);
+ bool
+ Update() override;
- virtual bool
- Update();
+ bool
+ MightHaveChildren() override;
- virtual bool
- MightHaveChildren ();
-
- virtual size_t
- GetIndexOfChildWithName (const ConstString &name);
-
- virtual
- ~NSArrayCodeRunningSyntheticFrontEnd ();
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
};
- }
-}
+ } // namespace formatters
+} // namespace lldb_private
bool
lldb_private::formatters::NSArraySummaryProvider (ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options)
@@ -480,6 +480,14 @@
return idx;
}
+lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::~NSArrayMSyntheticFrontEnd_109()
+{
+ delete m_data_32;
+ m_data_32 = NULL;
+ delete m_data_64;
+ m_data_64 = NULL;
+}
+
lldb::addr_t
lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::GetDataAddress ()
{
@@ -516,7 +524,7 @@
m_data_64->_size;
}
-lldb_private::formatters::NSArrayMSyntheticFrontEnd_109::~NSArrayMSyntheticFrontEnd_109 ()
+lldb_private::formatters::NSArrayMSyntheticFrontEnd_1010::~NSArrayMSyntheticFrontEnd_1010()
{
delete m_data_32;
m_data_32 = NULL;
@@ -560,14 +568,6 @@
m_data_64->_size;
}
-lldb_private::formatters::NSArrayMSyntheticFrontEnd_1010::~NSArrayMSyntheticFrontEnd_1010 ()
-{
- delete m_data_32;
- m_data_32 = NULL;
- delete m_data_64;
- m_data_64 = NULL;
-}
-
lldb_private::formatters::NSArrayISyntheticFrontEnd::NSArrayISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
SyntheticChildrenFrontEnd (*valobj_sp.get()),
m_exe_ctx_ref (),
@@ -587,10 +587,6 @@
}
}
-lldb_private::formatters::NSArrayISyntheticFrontEnd::~NSArrayISyntheticFrontEnd ()
-{
-}
-
size_t
lldb_private::formatters::NSArrayISyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
{
@@ -666,10 +662,6 @@
{
}
-lldb_private::formatters::NSArray0SyntheticFrontEnd::~NSArray0SyntheticFrontEnd ()
-{
-}
-
size_t
lldb_private::formatters::NSArray0SyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
{
@@ -798,6 +790,3 @@
{
return 0;
}
-
-lldb_private::formatters::NSArrayCodeRunningSyntheticFrontEnd::~NSArrayCodeRunningSyntheticFrontEnd ()
-{}