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/CPlusPlus/CPlusPlusLanguage.h b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
index ec2681a..1a8c0f6 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
+++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
@@ -1,4 +1,4 @@
-//===-- CPlusPlusLanguage.h ----------------------------------------*- C++ -*-===//
+//===-- CPlusPlusLanguage.h -------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -116,10 +116,10 @@
bool m_parse_error;
};
- virtual ~CPlusPlusLanguage() = default;
-
- CPlusPlusLanguage () = default;
-
+ CPlusPlusLanguage() = default;
+
+ ~CPlusPlusLanguage() override = default;
+
lldb::LanguageType
GetLanguageType () const override
{
@@ -171,17 +171,16 @@
static uint32_t
FindEquivalentNames(ConstString type_name, std::vector<ConstString>& equivalents);
-
//------------------------------------------------------------------
// PluginInterface protocol
//------------------------------------------------------------------
- virtual ConstString
+ ConstString
GetPluginName() override;
- virtual uint32_t
+ uint32_t
GetPluginVersion() override;
};
} // namespace lldb_private
-#endif // liblldb_CPlusPlusLanguage_h_
+#endif // liblldb_CPlusPlusLanguage_h_
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
index ac6501f..9970d49 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
@@ -1,4 +1,4 @@
-//===-- LibCxxInitializerList.cpp ----------------------------------*- C++ -*-===//
+//===-- LibCxxInitializerList.cpp -------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,6 +7,10 @@
//
//===----------------------------------------------------------------------===//
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "LibCxx.h"
#include "lldb/Core/ConstString.h"
@@ -23,24 +27,24 @@
{
public:
LibcxxInitializerListSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~LibcxxInitializerListSyntheticFrontEnd() override;
+
+ 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 ();
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
- virtual size_t
- GetIndexOfChildWithName (const ConstString &name);
-
- virtual
- ~LibcxxInitializerListSyntheticFrontEnd ();
private:
ValueObject* m_start;
CompilerType m_element_type;
@@ -48,8 +52,8 @@
size_t m_num_elements;
std::map<size_t,lldb::ValueObjectSP> m_children;
};
- }
-}
+ } // namespace formatters
+} // namespace lldb_private
lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::LibcxxInitializerListSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
SyntheticChildrenFrontEnd(*valobj_sp.get()),
@@ -63,6 +67,12 @@
Update();
}
+lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::~LibcxxInitializerListSyntheticFrontEnd()
+{
+ // this needs to stay around because it's a child object who will follow its parent's life cycle
+ // delete m_start;
+}
+
size_t
lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::CalculateNumChildren ()
{
@@ -128,12 +138,6 @@
return ExtractIndexFromString(name.GetCString());
}
-lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::~LibcxxInitializerListSyntheticFrontEnd ()
-{
- // this needs to stay around because it's a child object who will follow its parent's life cycle
- // delete m_start;
-}
-
lldb_private::SyntheticChildrenFrontEnd*
lldb_private::formatters::LibcxxInitializerListSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
{
@@ -141,4 +145,3 @@
return NULL;
return (new LibcxxInitializerListSyntheticFrontEnd(valobj_sp));
}
-
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
index 7da1b7a..17b696a 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp
@@ -1,4 +1,4 @@
-//===-- LibCxxList.cpp -------------------------------------------*- C++ -*-===//
+//===-- LibCxxList.cpp ------------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,6 +7,10 @@
//
//===----------------------------------------------------------------------===//
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "LibCxx.h"
#include "lldb/Core/DataBufferHeap.h"
@@ -29,24 +33,24 @@
{
public:
LibcxxStdListSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~LibcxxStdListSyntheticFrontEnd() 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 ();
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
- virtual size_t
- GetIndexOfChildWithName (const ConstString &name);
-
- virtual
- ~LibcxxStdListSyntheticFrontEnd ();
private:
bool
HasLoop(size_t);
@@ -61,13 +65,13 @@
size_t m_count;
std::map<size_t,lldb::ValueObjectSP> m_children;
};
- }
-}
+ } // namespace formatters
+} // namespace lldb_private
class ListEntry
{
public:
- ListEntry () {}
+ ListEntry() = default;
ListEntry (ValueObjectSP entry_sp) : m_entry_sp(entry_sp) {}
ListEntry (const ListEntry& rhs) : m_entry_sp(rhs.m_entry_sp) {}
ListEntry (ValueObject* entry) : m_entry_sp(entry ? entry->GetSP() : ValueObjectSP()) {}
@@ -132,7 +136,7 @@
class ListIterator
{
public:
- ListIterator () {}
+ ListIterator() = default;
ListIterator (ListEntry entry) : m_entry(entry) {}
ListIterator (ValueObjectSP entry) : m_entry(entry) {}
ListIterator (const ListIterator& rhs) : m_entry(rhs.m_entry) {}
@@ -182,6 +186,7 @@
{
m_entry = m_entry.prev();
}
+
private:
ListEntry m_entry;
};
@@ -357,9 +362,6 @@
return ExtractIndexFromString(name.GetCString());
}
-lldb_private::formatters::LibcxxStdListSyntheticFrontEnd::~LibcxxStdListSyntheticFrontEnd ()
-{}
-
SyntheticChildrenFrontEnd*
lldb_private::formatters::LibcxxStdListSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
{
@@ -367,4 +369,3 @@
return NULL;
return (new LibcxxStdListSyntheticFrontEnd(valobj_sp));
}
-
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
index 99557fc..2ba8846 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp
@@ -1,4 +1,4 @@
-//===-- LibCxxList.cpp -------------------------------------------*- C++ -*-===//
+//===-- LibCxxList.cpp ------------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,6 +7,10 @@
//
//===----------------------------------------------------------------------===//
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "LibCxx.h"
#include "lldb/Core/DataBufferHeap.h"
@@ -29,24 +33,24 @@
{
public:
LibcxxStdMapSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~LibcxxStdMapSyntheticFrontEnd() 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 ();
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
- virtual size_t
- GetIndexOfChildWithName (const ConstString &name);
-
- virtual
- ~LibcxxStdMapSyntheticFrontEnd ();
private:
bool
GetDataType();
@@ -61,13 +65,13 @@
size_t m_count;
std::map<size_t,lldb::ValueObjectSP> m_children;
};
- }
-}
+ } // namespace formatters
+} // namespace lldb_private
class MapEntry
{
public:
- MapEntry () {}
+ MapEntry() = default;
explicit MapEntry (ValueObjectSP entry_sp) : m_entry_sp(entry_sp) {}
MapEntry (const MapEntry& rhs) : m_entry_sp(rhs.m_entry_sp) {}
explicit MapEntry (ValueObject* entry) : m_entry_sp(entry ? entry->GetSP() : ValueObjectSP()) {}
@@ -146,7 +150,7 @@
class MapIterator
{
public:
- MapIterator () {}
+ MapIterator() = default;
MapIterator (MapEntry entry, size_t depth = 0) : m_entry(entry), m_max_depth(depth), m_error(false) {}
MapIterator (ValueObjectSP entry, size_t depth = 0) : m_entry(entry), m_max_depth(depth), m_error(false) {}
MapIterator (const MapIterator& rhs) : m_entry(rhs.m_entry),m_max_depth(rhs.m_max_depth), m_error(false) {}
@@ -176,6 +180,7 @@
}
return m_entry.GetEntry();
}
+
protected:
void
next ()
@@ -440,9 +445,6 @@
return ExtractIndexFromString(name.GetCString());
}
-lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::~LibcxxStdMapSyntheticFrontEnd ()
-{}
-
SyntheticChildrenFrontEnd*
lldb_private::formatters::LibcxxStdMapSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
{
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
index 82af5bd..8ad806d 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
@@ -1,4 +1,4 @@
-//===-- LibCxxUnorderedMap.cpp -----------------------------------*- C++ -*-===//
+//===-- LibCxxUnorderedMap.cpp ----------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,6 +7,10 @@
//
//===----------------------------------------------------------------------===//
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "LibCxx.h"
#include "lldb/Core/DataBufferHeap.h"
@@ -29,34 +33,33 @@
{
public:
LibcxxStdUnorderedMapSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~LibcxxStdUnorderedMapSyntheticFrontEnd() 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
- ~LibcxxStdUnorderedMapSyntheticFrontEnd ();
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
+
private:
-
ValueObject* m_tree;
size_t m_num_elements;
ValueObject* m_next_element;
std::map<size_t,lldb::ValueObjectSP> m_children;
std::vector<std::pair<ValueObject*, uint64_t> > m_elements_cache;
};
- }
-}
+ } // namespace formatters
+} // namespace lldb_private
lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::LibcxxStdUnorderedMapSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
SyntheticChildrenFrontEnd(*valobj_sp.get()),
@@ -160,9 +163,6 @@
return ExtractIndexFromString(name.GetCString());
}
-lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::~LibcxxStdUnorderedMapSyntheticFrontEnd ()
-{}
-
SyntheticChildrenFrontEnd*
lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
{
diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
index 6c448b3..9fb4f48e 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
@@ -1,4 +1,4 @@
-//===-- LibCxxVector.cpp -----------------------------------------*- C++ -*-===//
+//===-- LibCxxVector.cpp ----------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -7,6 +7,10 @@
//
//===----------------------------------------------------------------------===//
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
#include "LibCxx.h"
#include "lldb/Core/ConstString.h"
@@ -23,24 +27,24 @@
{
public:
LibcxxStdVectorSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+
+ ~LibcxxStdVectorSyntheticFrontEnd() override;
+
+ 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
- ~LibcxxStdVectorSyntheticFrontEnd ();
+ size_t
+ GetIndexOfChildWithName(const ConstString &name) override;
+
private:
ValueObject* m_start;
ValueObject* m_finish;
@@ -48,8 +52,8 @@
uint32_t m_element_size;
std::map<size_t,lldb::ValueObjectSP> m_children;
};
- }
-}
+ } // namespace formatters
+} // namespace lldb_private
lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::LibcxxStdVectorSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
SyntheticChildrenFrontEnd(*valobj_sp.get()),
@@ -63,6 +67,13 @@
Update();
}
+lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::~LibcxxStdVectorSyntheticFrontEnd()
+{
+ // these need to stay around because they are child objects who will follow their parent's life cycle
+ // delete m_start;
+ // delete m_finish;
+}
+
size_t
lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::CalculateNumChildren ()
{
@@ -139,13 +150,6 @@
return ExtractIndexFromString(name.GetCString());
}
-lldb_private::formatters::LibcxxStdVectorSyntheticFrontEnd::~LibcxxStdVectorSyntheticFrontEnd ()
-{
- // these need to stay around because they are child objects who will follow their parent's life cycle
- // delete m_start;
- // delete m_finish;
-}
-
lldb_private::SyntheticChildrenFrontEnd*
lldb_private::formatters::LibcxxStdVectorSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
{
@@ -153,4 +157,3 @@
return NULL;
return (new LibcxxStdVectorSyntheticFrontEnd(valobj_sp));
}
-