Fix Clang-tidy modernize-use-override warnings in some files in source; other minor fixes.

llvm-svn: 251309

1 files changed, 72 insertions, 51 deletions

diff --git a/lldb/source/Expression/Materializer.cpp b/lldb/source/Expression/Materializer.cpp
index 7e748d1386a..3c73f49838a 100644
--- a/lldb/source/Expression/Materializer.cpp
+++ b/lldb/source/Expression/Materializer.cpp
@@ -7,6 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/Core/Log.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Core/ValueObjectConstResult.h"
@@ -148,7 +152,10 @@ public:
         }
     }
     
-    void Materialize (lldb::StackFrameSP &frame_sp, IRMemoryMap &map, lldb::addr_t process_address, Error &err)
+    void Materialize(lldb::StackFrameSP &frame_sp,
+                     IRMemoryMap &map,
+                     lldb::addr_t process_address,
+                     Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
 
@@ -193,12 +200,12 @@ public:
         }
     }
     
-    void Dematerialize (lldb::StackFrameSP &frame_sp,
-                        IRMemoryMap &map,
-                        lldb::addr_t process_address,
-                        lldb::addr_t frame_top,
-                        lldb::addr_t frame_bottom,
-                        Error &err)
+    void Dematerialize(lldb::StackFrameSP &frame_sp,
+                       IRMemoryMap &map,
+                       lldb::addr_t process_address,
+                       lldb::addr_t frame_top,
+                       lldb::addr_t frame_bottom,
+                       Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
         
@@ -326,7 +333,7 @@ public:
         }
     }
     
-    void DumpToLog (IRMemoryMap &map, lldb::addr_t process_address, Log *log)
+    void DumpToLog(IRMemoryMap &map, lldb::addr_t process_address, Log *log) override
     {
         StreamString dump_stream;
         
@@ -392,9 +399,10 @@ public:
         log->PutCString(dump_stream.GetData());
     }
     
-    void Wipe (IRMemoryMap &map, lldb::addr_t process_address)
+    void Wipe(IRMemoryMap &map, lldb::addr_t process_address) override
     {
     }
+
 private:
     lldb::ExpressionVariableSP m_persistent_variable_sp;
     Materializer::PersistentVariableDelegate *m_delegate;
@@ -428,7 +436,10 @@ public:
         m_is_reference = m_variable_sp->GetType()->GetForwardCompilerType ().IsReferenceType();
     }
     
-    void Materialize (lldb::StackFrameSP &frame_sp, IRMemoryMap &map, lldb::addr_t process_address, Error &err)
+    void Materialize(lldb::StackFrameSP &frame_sp,
+                     IRMemoryMap &map,
+                     lldb::addr_t process_address,
+                     Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
         
@@ -575,12 +586,12 @@ public:
         }
     }
     
-    void Dematerialize (lldb::StackFrameSP &frame_sp,
-                        IRMemoryMap &map,
-                        lldb::addr_t process_address,
-                        lldb::addr_t frame_top,
-                        lldb::addr_t frame_bottom,
-                        Error &err)
+    void Dematerialize(lldb::StackFrameSP &frame_sp,
+                       IRMemoryMap &map,
+                       lldb::addr_t process_address,
+                       lldb::addr_t frame_top,
+                       lldb::addr_t frame_bottom,
+                       Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
 
@@ -659,7 +670,7 @@ public:
         }
     }
     
-    void DumpToLog (IRMemoryMap &map, lldb::addr_t process_address, Log *log)
+    void DumpToLog(IRMemoryMap &map, lldb::addr_t process_address, Log *log) override
     {
         StreamString dump_stream;
 
@@ -731,7 +742,7 @@ public:
         log->PutCString(dump_stream.GetData());
     }
     
-    void Wipe (IRMemoryMap &map, lldb::addr_t process_address)
+    void Wipe(IRMemoryMap &map, lldb::addr_t process_address) override
     {
         if (m_temporary_allocation != LLDB_INVALID_ADDRESS)
         {
@@ -744,6 +755,7 @@ public:
         }
 
     }
+
 private:
     lldb::VariableSP    m_variable_sp;
     bool                m_is_reference;
@@ -782,7 +794,10 @@ public:
         m_alignment = 8;
     }
     
-    void Materialize (lldb::StackFrameSP &frame_sp, IRMemoryMap &map, lldb::addr_t process_address, Error &err)
+    void Materialize(lldb::StackFrameSP &frame_sp,
+                     IRMemoryMap &map,
+                     lldb::addr_t process_address,
+                     Error &err) override
     {
         if (!m_is_program_reference)
         {
@@ -823,12 +838,12 @@ public:
         }
     }
     
-    void Dematerialize (lldb::StackFrameSP &frame_sp,
-                        IRMemoryMap &map,
-                        lldb::addr_t process_address,
-                        lldb::addr_t frame_top,
-                        lldb::addr_t frame_bottom,
-                        Error &err)
+    void Dematerialize(lldb::StackFrameSP &frame_sp,
+                       IRMemoryMap &map,
+                       lldb::addr_t process_address,
+                       lldb::addr_t frame_top,
+                       lldb::addr_t frame_bottom,
+                       Error &err) override
     {
         err.Clear();
         
@@ -942,7 +957,7 @@ public:
         m_temporary_allocation_size = 0;
     }
     
-    void DumpToLog (IRMemoryMap &map, lldb::addr_t process_address, Log *log)
+    void DumpToLog(IRMemoryMap &map, lldb::addr_t process_address, Log *log) override
     {
         StreamString dump_stream;
         
@@ -1015,7 +1030,7 @@ public:
         log->PutCString(dump_stream.GetData());
     }
     
-    void Wipe (IRMemoryMap &map, lldb::addr_t process_address)
+    void Wipe(IRMemoryMap &map, lldb::addr_t process_address) override
     {
         if (!m_keep_in_memory && m_temporary_allocation != LLDB_INVALID_ADDRESS)
         {
@@ -1027,6 +1042,7 @@ public:
         m_temporary_allocation = LLDB_INVALID_ADDRESS;
         m_temporary_allocation_size = 0;
     }
+
 private:
     CompilerType    m_type;
     bool            m_is_program_reference;
@@ -1063,7 +1079,10 @@ public:
         m_alignment = 8;
     }
     
-    void Materialize (lldb::StackFrameSP &frame_sp, IRMemoryMap &map, lldb::addr_t process_address, Error &err)
+    void Materialize(lldb::StackFrameSP &frame_sp,
+                     IRMemoryMap &map,
+                     lldb::addr_t process_address,
+                     Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
 
@@ -1107,12 +1126,12 @@ public:
         }
     }
     
-    void Dematerialize (lldb::StackFrameSP &frame_sp,
-                        IRMemoryMap &map,
-                        lldb::addr_t process_address,
-                        lldb::addr_t frame_top,
-                        lldb::addr_t frame_bottom,
-                        Error &err)
+    void Dematerialize(lldb::StackFrameSP &frame_sp,
+                       IRMemoryMap &map,
+                       lldb::addr_t process_address,
+                       lldb::addr_t frame_top,
+                       lldb::addr_t frame_bottom,
+                       Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
 
@@ -1128,7 +1147,7 @@ public:
         // no work needs to be done
     }
     
-    void DumpToLog (IRMemoryMap &map, lldb::addr_t process_address, Log *log)
+    void DumpToLog(IRMemoryMap &map, lldb::addr_t process_address, Log *log) override
     {
         StreamString dump_stream;
         
@@ -1162,9 +1181,10 @@ public:
         log->PutCString(dump_stream.GetData());
     }
     
-    void Wipe (IRMemoryMap &map, lldb::addr_t process_address)
+    void Wipe(IRMemoryMap &map, lldb::addr_t process_address) override
     {
     }
+
 private:
     Symbol m_symbol;
 };
@@ -1191,7 +1211,10 @@ public:
         m_alignment = m_register_info.byte_size;
     }
     
-    void Materialize (lldb::StackFrameSP &frame_sp, IRMemoryMap &map, lldb::addr_t process_address, Error &err)
+    void Materialize(lldb::StackFrameSP &frame_sp,
+                     IRMemoryMap &map,
+                     lldb::addr_t process_address,
+                     Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
         
@@ -1247,12 +1270,12 @@ public:
         }
     }
     
-    void Dematerialize (lldb::StackFrameSP &frame_sp,
-                        IRMemoryMap &map,
-                        lldb::addr_t process_address,
-                        lldb::addr_t frame_top,
-                        lldb::addr_t frame_bottom,
-                        Error &err)
+    void Dematerialize(lldb::StackFrameSP &frame_sp,
+                       IRMemoryMap &map,
+                       lldb::addr_t process_address,
+                       lldb::addr_t frame_top,
+                       lldb::addr_t frame_bottom,
+                       Error &err) override
     {
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
         
@@ -1304,7 +1327,7 @@ public:
         }
     }
     
-    void DumpToLog (IRMemoryMap &map, lldb::addr_t process_address, Log *log)
+    void DumpToLog(IRMemoryMap &map, lldb::addr_t process_address, Log *log) override
     {
         StreamString dump_stream;
         
@@ -1339,9 +1362,10 @@ public:
         log->PutCString(dump_stream.GetData());
     }
     
-    void Wipe (IRMemoryMap &map, lldb::addr_t process_address)
+    void Wipe(IRMemoryMap &map, lldb::addr_t process_address) override
     {
     }
+
 private:
     RegisterInfo m_register_info;
     lldb::DataBufferSP m_register_contents;
@@ -1474,12 +1498,9 @@ Materializer::Dematerializer::Wipe ()
         entity_up->Wipe (*m_map, m_process_address);
     }
 
-    m_materializer = NULL;
-    m_map = NULL;
+    m_materializer = nullptr;
+    m_map = nullptr;
     m_process_address = LLDB_INVALID_ADDRESS;
 }
 
-Materializer::PersistentVariableDelegate::~PersistentVariableDelegate()
-{
-}
-
+Materializer::PersistentVariableDelegate::~PersistentVariableDelegate() = default;