1 files changed, 36 insertions, 37 deletions

diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
index a6fb6d2bacc..9fd1862cd75 100644
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h
@@ -12,6 +12,12 @@
 
 // C Includes
 // C++ Includes
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 // Other libraries and framework includes
 // Project includes
 #include "lldb/lldb-private.h"
@@ -19,12 +25,8 @@
 #include "lldb/Target/CPPLanguageRuntime.h"
 #include "lldb/Core/Module.h"
 
-#include <array>
-namespace lldb_private
-{
-
-namespace lldb_renderscript
-{
+namespace lldb_private {
+namespace lldb_renderscript {
 
 typedef uint32_t RSSlot;
 class RSModuleDescriptor;
@@ -40,8 +42,7 @@ typedef std::shared_ptr<RSKernelDescriptor> RSKernelDescriptorSP;
 // As well as check for .expand kernels as a fallback.
 class RSBreakpointResolver : public BreakpointResolver
 {
-  public:
-
+public:
     RSBreakpointResolver(Breakpoint *bkpt, ConstString name):
                          BreakpointResolver (bkpt, BreakpointResolver::NameResolver),
                          m_kernel_name(name)
@@ -79,13 +80,13 @@ class RSBreakpointResolver : public BreakpointResolver
         return ret_sp;
     }
 
-  protected:
+protected:
     ConstString m_kernel_name;
 };
 
 struct RSKernelDescriptor
 {
-  public:
+public:
     RSKernelDescriptor(const RSModuleDescriptor *module, const char *name, uint32_t slot)
         : m_module(module)
         , m_name(name)
@@ -102,7 +103,7 @@ struct RSKernelDescriptor
 
 struct RSGlobalDescriptor
 {
-  public:
+public:
     RSGlobalDescriptor(const RSModuleDescriptor *module, const char *name )
         : m_module(module)
         , m_name(name)
@@ -117,13 +118,13 @@ struct RSGlobalDescriptor
 
 class RSModuleDescriptor
 {
-  public:
+public:
     RSModuleDescriptor(const lldb::ModuleSP &module)
         : m_module(module)
     {
     }
 
-    ~RSModuleDescriptor() {}
+    ~RSModuleDescriptor() = default;
 
     bool ParseRSInfo();
 
@@ -136,12 +137,11 @@ class RSModuleDescriptor
     std::string m_resname;
 };
 
-} // end lldb_renderscript namespace
+} // namespace lldb_renderscript
 
 class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime
 {
-  public:
-
+public:
     enum ModuleKind
     {
         eModuleKindIgnored,
@@ -151,7 +151,7 @@ class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime
         eModuleKindKernelObj
     };
 
-    ~RenderScriptRuntime();
+    ~RenderScriptRuntime() override;
 
     //------------------------------------------------------------------
     // Static Functions
@@ -172,26 +172,19 @@ class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime
 
     static void ModulesDidLoad(const lldb::ProcessSP& process_sp, const ModuleList &module_list );
 
-    //------------------------------------------------------------------
-    // PluginInterface protocol
-    //------------------------------------------------------------------
-    virtual lldb_private::ConstString GetPluginName();
-
-    virtual uint32_t GetPluginVersion();
-
-    virtual bool IsVTableName(const char *name);
+    bool IsVTableName(const char *name) override;
 
-    virtual bool GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
-                                          TypeAndOrName &class_type_or_name, Address &address,
-                                          Value::ValueType &value_type);
+    bool GetDynamicTypeAndAddress(ValueObject &in_value, lldb::DynamicValueType use_dynamic,
+                                  TypeAndOrName &class_type_or_name, Address &address,
+                                  Value::ValueType &value_type) override;
     
-    virtual TypeAndOrName
-    FixUpDynamicType (const TypeAndOrName& type_and_or_name,
-                      ValueObject& static_value);
+    TypeAndOrName
+    FixUpDynamicType(const TypeAndOrName& type_and_or_name,
+                     ValueObject& static_value) override;
 
-    virtual bool CouldHaveDynamicValue(ValueObject &in_value);
+    bool CouldHaveDynamicValue(ValueObject &in_value) override;
 
-    virtual lldb::BreakpointResolverSP CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bool throw_bp);
+    lldb::BreakpointResolverSP CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bool throw_bp) override;
 
     bool LoadModule(const lldb::ModuleSP &module_sp);
 
@@ -214,11 +207,11 @@ class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime
 
     void Status(Stream &strm) const;
 
-    virtual size_t GetAlternateManglings(const ConstString &mangled, std::vector<ConstString> &alternates) {
+    size_t GetAlternateManglings(const ConstString &mangled, std::vector<ConstString> &alternates) override {
         return static_cast<size_t>(0);
     }
 
-    virtual void ModulesDidLoad(const ModuleList &module_list );
+    void ModulesDidLoad(const ModuleList &module_list) override;
 
     bool LoadAllocation(Stream &strm, const uint32_t alloc_id, const char* filename, StackFrame* frame_ptr);
 
@@ -228,8 +221,14 @@ class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime
 
     void Initiate();
 
-  protected:
+    //------------------------------------------------------------------
+    // PluginInterface protocol
+    //------------------------------------------------------------------
+    lldb_private::ConstString GetPluginName() override;
+
+    uint32_t GetPluginVersion() override;
 
+protected:
     struct ScriptDetails;
     struct AllocationDetails;
 
@@ -293,7 +292,7 @@ class RenderScriptRuntime : public lldb_private::CPPLanguageRuntime
     static const HookDefn s_runtimeHookDefns[];
     static const size_t s_runtimeHookCount;
 
-  private:
+private:
     RenderScriptRuntime(Process *process); // Call CreateInstance instead.
     
     static bool HookCallback(void *baton, StoppointCallbackContext *ctx, lldb::user_id_t break_id,