[LLDB] Fix Clang-tidy misc-use-override warnings in include/lldb/Expression and include/lldb/Initialization, unify inclusion guards

[Eugene.Zelenko]

Summary

I checked this patch on my own build on RHEL 6.

Please check it in if it's OK, because I don't have SVN write access.

[labath]

Committed as r245283.

include/lldb/Expression/ASTResultSynthesizer.h

     //----------------------------------------------------------------------
     /// Destructor
     //----------------------------------------------------------------------
-    ~ASTResultSynthesizer();
+    ~ASTResultSynthesizer() override;
     
     //----------------------------------------------------------------------
     /// Link this consumer with a particular AST context

     ///     This AST context will be used for types and identifiers, and also
     ///     forwarded to the passthrough consumer, if one exists.
     //----------------------------------------------------------------------
-    void Initialize(clang::ASTContext &Context);
+    void Initialize(clang::ASTContext &Context) override;
     
     //----------------------------------------------------------------------
     /// Examine a list of Decls to find the function $__lldb_expr and 

     ///     which need to be searched recursively.  That job falls to
     ///     TransformTopLevelDecl.
     //----------------------------------------------------------------------
-    bool HandleTopLevelDecl(clang::DeclGroupRef D);
+    bool HandleTopLevelDecl(clang::DeclGroupRef D) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void HandleTranslationUnit(clang::ASTContext &Ctx);
+    void HandleTranslationUnit(clang::ASTContext &Ctx) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void HandleTagDeclDefinition(clang::TagDecl *D);
+    void HandleTagDeclDefinition(clang::TagDecl *D) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void CompleteTentativeDefinition(clang::VarDecl *D);
+    void CompleteTentativeDefinition(clang::VarDecl *D) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void HandleVTable(clang::CXXRecordDecl *RD);
+    void HandleVTable(clang::CXXRecordDecl *RD) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void PrintStats();
+    void PrintStats() override;
     
     //----------------------------------------------------------------------
     /// Set the Sema object to use when performing transforms, and pass it on

     ///     The Sema to use.  Because Sema isn't externally visible, this class
     ///     casts it to an Action for actual use.
     //----------------------------------------------------------------------
-    void InitializeSema(clang::Sema &S);
+    void InitializeSema(clang::Sema &S) override;
     
     //----------------------------------------------------------------------
     /// Reset the Sema to NULL now that transformations are done
     //----------------------------------------------------------------------
-    void ForgetSema();
+    void ForgetSema() override;
+
 private:
     //----------------------------------------------------------------------
     /// Hunt the given Decl for FunctionDecls named $__lldb_expr, recursing

     clang::Sema *m_sema;                        ///< The Sema to use.
 };
 
-}
+} // namespace lldb_private
 
-#endif
+#endif // liblldb_ASTResultSynthesizer_h_

include/lldb/Expression/ASTStructExtractor.h

     //----------------------------------------------------------------------
     /// Destructor
     //----------------------------------------------------------------------
-    virtual ~ASTStructExtractor();
+    ~ASTStructExtractor() override;
     
     //----------------------------------------------------------------------
     /// Link this consumer with a particular AST context

     ///     This AST context will be used for types and identifiers, and also
     ///     forwarded to the passthrough consumer, if one exists.
     //----------------------------------------------------------------------
-    void Initialize(clang::ASTContext &Context);
+    void Initialize(clang::ASTContext &Context) override;
     
     //----------------------------------------------------------------------
     /// Examine a list of Decls to find the function $__lldb_expr and 

     ///     which need to be searched recursively.  That job falls to
     ///     TransformTopLevelDecl.
     //----------------------------------------------------------------------
-    bool HandleTopLevelDecl(clang::DeclGroupRef D);
+    bool HandleTopLevelDecl(clang::DeclGroupRef D) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void HandleTranslationUnit(clang::ASTContext &Ctx);
+    void HandleTranslationUnit(clang::ASTContext &Ctx) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void HandleTagDeclDefinition(clang::TagDecl *D);
+    void HandleTagDeclDefinition(clang::TagDecl *D) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void CompleteTentativeDefinition(clang::VarDecl *D);
+    void CompleteTentativeDefinition(clang::VarDecl *D) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void HandleVTable(clang::CXXRecordDecl *RD);
+    void HandleVTable(clang::CXXRecordDecl *RD) override;
     
     //----------------------------------------------------------------------
     /// Passthrough stub
     //----------------------------------------------------------------------
-    void PrintStats();
+    void PrintStats() override;
     
     //----------------------------------------------------------------------
     /// Set the Sema object to use when performing transforms, and pass it on

     ///     The Sema to use.  Because Sema isn't externally visible, this class
     ///     casts it to an Action for actual use.
     //----------------------------------------------------------------------
-    void InitializeSema(clang::Sema &S);
+    void InitializeSema(clang::Sema &S) override;
     
     //----------------------------------------------------------------------
     /// Reset the Sema to NULL now that transformations are done
     //----------------------------------------------------------------------
-    void ForgetSema();
+    void ForgetSema() override;
+
 private:
     //----------------------------------------------------------------------
     /// Hunt the given FunctionDecl for the argument struct and place

     std::string                     m_struct_name;          ///< The name of the structure to extract.
 };
     
-}
+} // namespace lldb_private
 
-#endif
+#endif // liblldb_ASTStructExtractor_h_

include/lldb/Expression/ClangASTSource.h

     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~ClangASTSource();
+    ~ClangASTSource() override;
     
     //------------------------------------------------------------------
     /// Interface stubs.

     void AddNamedDecl (clang::NamedDecl *decl);
 };
 
-}
+} // namespace lldb_private
 
-#endif
+#endif // liblldb_ClangASTSource_h_

include/lldb/Expression/ClangExpressionDeclMap.h

     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~ClangExpressionDeclMap ();
+    ~ClangExpressionDeclMap() override;
     
     //------------------------------------------------------------------
     /// Enable the state needed for parsing and IR transformation.

     ///     True on success; false otherwise.
     //------------------------------------------------------------------
     void 
-    FindExternalVisibleDecls (NameSearchContext &context);
+    FindExternalVisibleDecls(NameSearchContext &context) override;
     
     //------------------------------------------------------------------
     /// Find all entities matching a given name in a given module/namespace,

     
 } // namespace lldb_private
 
-#endif  // liblldb_ClangExpressionDeclMap_h_
+#endif // liblldb_ClangExpressionDeclMap_h_

include/lldb/Expression/ClangFunction.h

 //
 //===----------------------------------------------------------------------===//
 
-#ifndef lldb_ClangFunction_h_
-#define lldb_ClangFunction_h_
+#ifndef liblldb_ClangFunction_h_
+#define liblldb_ClangFunction_h_
 
 // C Includes
 // C++ Includes

     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    virtual 
-    ~ClangFunction();
+    ~ClangFunction() override;
 
     //------------------------------------------------------------------
     /// Compile the wrapper function

     /// translation unit.
     //------------------------------------------------------------------
     const char *
-    Text ()
+    Text() override
     {
         return m_wrapper_function_text.c_str();
     }

     /// function.
     //------------------------------------------------------------------
     const char *
-    FunctionName ()
+    FunctionName() override
     {
         return m_wrapper_function_name.c_str();
     }

     /// values.  May be NULL if everything should be self-contained.
     //------------------------------------------------------------------
     ClangExpressionDeclMap *
-    DeclMap ()
+    DeclMap() override
     {
         return NULL;
     }

     ///     the ASTs to after transformation.
     //------------------------------------------------------------------
     clang::ASTConsumer *
-    ASTTransformer (clang::ASTConsumer *passthrough);
+    ASTTransformer(clang::ASTConsumer *passthrough) override;
     
     //------------------------------------------------------------------
     /// Return true if validation code should be inserted into the
     /// expression.
     //------------------------------------------------------------------
     bool
-    NeedsValidation ()
+    NeedsValidation() override
     {
         return false;
     }

     /// resolved.
     //------------------------------------------------------------------
     bool
-    NeedsVariableResolution ()
+    NeedsVariableResolution() override
     {
         return false;
     }

 
 } // Namespace lldb_private
 
-#endif  // lldb_ClangFunction_h_
+#endif // liblldb_ClangFunction_h_

include/lldb/Expression/ClangModulesDeclVendor.h

 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _liblldb_ClangModulesDeclVendor_
-#define _liblldb_ClangModulesDeclVendor_
+#ifndef liblldb_ClangModulesDeclVendor_h
+#define liblldb_ClangModulesDeclVendor_h
 
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/ClangForward.h"

     //------------------------------------------------------------------
     ClangModulesDeclVendor();
     
-    virtual
-    ~ClangModulesDeclVendor();
+    ~ClangModulesDeclVendor() override;
     
     static ClangModulesDeclVendor *
     Create(Target &target);

     //------------------------------------------------------------------
     static bool
     LanguageSupportsClangModules (lldb::LanguageType language);
-    
 };
     
-}
-#endif /* defined(_lldb_ClangModulesDeclVendor_) */
+} // namespace lldb_private
+
+#endif // liblldb_ClangModulesDeclVendor_h

include/lldb/Expression/ClangUserExpression.h

     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    virtual
-    ~ClangUserExpression ();
+    ~ClangUserExpression() override;
 
     //------------------------------------------------------------------
     /// Parse the expression

     /// translation unit.
     //------------------------------------------------------------------
     const char *
-    Text ()
+    Text() override
     {
         return m_transformed_text.c_str();
     }

     /// function.
     //------------------------------------------------------------------
     const char *
-    FunctionName ()
+    FunctionName() override
     {
         return "$__lldb_expr";
     }

     /// Return the language that should be used when parsing.  To use
     /// the default, return eLanguageTypeUnknown.
     //------------------------------------------------------------------
-    virtual lldb::LanguageType
-    Language ()
+    lldb::LanguageType
+    Language() override
     {
         return m_language;
     }

     /// values.  May be NULL if everything should be self-contained.
     //------------------------------------------------------------------
     ClangExpressionDeclMap *
-    DeclMap ()
+    DeclMap() override
     {
         return m_expr_decl_map.get();
     }

     ///     the ASTs to after transformation.
     //------------------------------------------------------------------
     clang::ASTConsumer *
-    ASTTransformer (clang::ASTConsumer *passthrough);
+    ASTTransformer(clang::ASTConsumer *passthrough) override;
 
     //------------------------------------------------------------------
     /// Return the desired result type of the function, or
     /// eResultTypeAny if indifferent.
     //------------------------------------------------------------------
-    virtual ResultType
-    DesiredResultType ()
+    ResultType
+    DesiredResultType() override
     {
         return m_desired_type;
     }

     /// expression.
     //------------------------------------------------------------------
     bool
-    NeedsValidation ()
+    NeedsValidation() override
     {
         return true;
     }

     /// resolved.
     //------------------------------------------------------------------
     bool
-    NeedsVariableResolution ()
+    NeedsVariableResolution() override
     {
         return true;
     }

 
 } // namespace lldb_private
 
-#endif  // liblldb_ClangUserExpression_h_
+#endif // liblldb_ClangUserExpression_h_

include/lldb/Expression/ClangUtilityFunction.h

     ClangUtilityFunction (const char *text, 
                           const char *name);
     
-    virtual 
-    ~ClangUtilityFunction ();
+    ~ClangUtilityFunction() override;
 
     //------------------------------------------------------------------
     /// Install the utility function into a process

     /// translation unit.
     //------------------------------------------------------------------
     const char *
-    Text ()
+    Text() override
     {
         return m_function_text.c_str();
     }

     /// function.
     //------------------------------------------------------------------
     const char *
-    FunctionName ()
+    FunctionName() override
     {
         return m_function_name.c_str();
     }

     /// values.  May be NULL if everything should be self-contained.
     //------------------------------------------------------------------
     ClangExpressionDeclMap *
-    DeclMap ()
+    DeclMap() override
     {
         return m_expr_decl_map.get();
     }

     ///     the ASTs to after transformation.
     //------------------------------------------------------------------
     clang::ASTConsumer *
-    ASTTransformer (clang::ASTConsumer *passthrough)
+    ASTTransformer(clang::ASTConsumer *passthrough) override
     {
         return NULL;
     }

     /// expression.
     //------------------------------------------------------------------
     bool
-    NeedsValidation ()
+    NeedsValidation() override
     {
         return false;
     }

     /// resolved.
     //------------------------------------------------------------------
     bool
-    NeedsVariableResolution ()
+    NeedsVariableResolution() override
     {
         return false;
     }

 
 } // namespace lldb_private
 
-#endif  // liblldb_ClangUtilityFunction_h_
+#endif // liblldb_ClangUtilityFunction_h_

include/lldb/Expression/IRDynamicChecks.h

     class Value;
 }
 
-namespace lldb_private 
+namespace lldb_private
 {
 
 class ClangExpressionDeclMap;

     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    virtual ~IRDynamicChecks();
+    ~IRDynamicChecks() override;
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module

     /// @return
     ///     True on success; false otherwise
     //------------------------------------------------------------------
-    bool runOnModule(llvm::Module &M);
+    bool runOnModule(llvm::Module &M) override;
     
     //------------------------------------------------------------------
     /// Interface stub
     //------------------------------------------------------------------
     void assignPassManager(llvm::PMStack &PMS,
-                           llvm::PassManagerType T = llvm::PMT_ModulePassManager);
+                           llvm::PassManagerType T = llvm::PMT_ModulePassManager)  override;
     
     //------------------------------------------------------------------
     /// Returns PMT_ModulePassManager
     //------------------------------------------------------------------
-    llvm::PassManagerType getPotentialPassManagerType() const;
+    llvm::PassManagerType getPotentialPassManagerType() const override;
+
 private:
     //------------------------------------------------------------------
     /// A basic block-level pass to find all pointer dereferences and

     DynamicCheckerFunctions    &m_checker_functions;    ///< The checker functions for the process
 };
     
-}
+} // namespace lldb_private
 
-#endif
+#endif // liblldb_IRDynamicChecks_h_

include/lldb/Expression/IRExecutionUnit.h

 //
 //===----------------------------------------------------------------------===//
 
-#ifndef lldb_IRExecutionUnit_h_
-#define lldb_IRExecutionUnit_h_
+#ifndef liblldb_IRExecutionUnit_h_
+#define liblldb_IRExecutionUnit_h_
 
 // C Includes
 // C++ Includes

     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    ~IRExecutionUnit();
+    ~IRExecutionUnit() override;
         
     llvm::Module *
     GetModule()

     //------------------------------------------------------------------
     /// ObjectFileJITDelegate overrides
     //------------------------------------------------------------------
-    virtual lldb::ByteOrder
-    GetByteOrder () const;
+    lldb::ByteOrder
+    GetByteOrder() const override;
     
-    virtual uint32_t
-    GetAddressByteSize () const;
+    uint32_t
+    GetAddressByteSize() const override;
     
-    virtual void
-    PopulateSymtab (lldb_private::ObjectFile *obj_file,
-                    lldb_private::Symtab &symtab);
+    void
+    PopulateSymtab(lldb_private::ObjectFile *obj_file,
+       lldb_private::Symtab &symtab) override;
     
-    virtual void
-    PopulateSectionList (lldb_private::ObjectFile *obj_file,
-                         lldb_private::SectionList &section_list);
+    void
+    PopulateSectionList(lldb_private::ObjectFile *obj_file,
+      lldb_private::SectionList &section_list) override;
     
-    virtual bool
-    GetArchitecture (lldb_private::ArchSpec &arch);
+    bool
+    GetArchitecture(lldb_private::ArchSpec &arch) override;
     
     lldb::ModuleSP
     GetJITModule ();

     public:
         MemoryManager (IRExecutionUnit &parent);
         
-        virtual ~MemoryManager();
+        ~MemoryManager() override;
         
         //------------------------------------------------------------------
         /// Allocate space for executable code, and add it to the

         /// @return
         ///     Allocated space.
         //------------------------------------------------------------------
-        virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
-                                             unsigned SectionID,
-                                             llvm::StringRef SectionName);
+        uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
+             unsigned SectionID,
+             llvm::StringRef SectionName) override;
         
         //------------------------------------------------------------------
         /// Allocate space for data, and add it to the m_spaceBlocks map

         /// @return
         ///     Allocated space.
         //------------------------------------------------------------------
-        virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
-                                             unsigned SectionID,
-                                             llvm::StringRef SectionName,
-                                             bool IsReadOnly);
+        uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
+             unsigned SectionID,
+             llvm::StringRef SectionName,
+             bool IsReadOnly) override;
         
         //------------------------------------------------------------------
         /// Called when object loading is complete and section page

         /// @return
         ///     True in case of failure, false in case of success.
         //------------------------------------------------------------------
-        virtual bool finalizeMemory(std::string *ErrMsg) {
+        bool finalizeMemory(std::string *ErrMsg) override {
             // TODO: Ensure that the instruction cache is flushed because
             // relocations are updated by dy-load.  See:
             //   sys::Memory::InvalidateInstructionCache

             return false;
         }
         
-        virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
-            return;
+        void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) override {
         }
         
         //------------------------------------------------------------------
         /// Passthrough interface stub
         //------------------------------------------------------------------
-        virtual uint64_t getSymbolAddress(const std::string &Name);
+        uint64_t getSymbolAddress(const std::string &Name) override;
 
-        virtual void *getPointerToNamedFunction(const std::string &Name,
-                                                bool AbortOnFailure = true);
+        void *getPointerToNamedFunction(const std::string &Name,
+          bool AbortOnFailure = true) override;
+
     private:
         std::unique_ptr<SectionMemoryManager>    m_default_mm_ap;    ///< The memory allocator to use in actually creating space.  All calls are passed through to it.
         IRExecutionUnit                    &m_parent;           ///< The execution unit this is a proxy for.

 
 } // namespace lldb_private
 
-#endif  // lldb_IRExecutionUnit_h_
+#endif // liblldb_IRExecutionUnit_h_

include/lldb/Expression/IRForTarget.h

     //------------------------------------------------------------------
     /// Destructor
     //------------------------------------------------------------------
-    virtual ~IRForTarget();
+    ~IRForTarget() override;
     
     //------------------------------------------------------------------
     /// Run this IR transformer on a single module

     /// @return
     ///     True on success; false otherwise
     //------------------------------------------------------------------
-    virtual bool 
-    runOnModule (llvm::Module &llvm_module);
+    bool 
+    runOnModule(llvm::Module &llvm_module) override;
     
     //------------------------------------------------------------------
     /// Interface stub

     /// Implementation of the llvm::ModulePass::assignPassManager() 
     /// function.
     //------------------------------------------------------------------
-    virtual void
-    assignPassManager (llvm::PMStack &pass_mgr_stack,
-                       llvm::PassManagerType pass_mgr_type = llvm::PMT_ModulePassManager);
+    void
+    assignPassManager(llvm::PMStack &pass_mgr_stack,
+          llvm::PassManagerType pass_mgr_type = llvm::PMT_ModulePassManager) override;
     
     //------------------------------------------------------------------
     /// Returns PMT_ModulePassManager

     /// Implementation of the llvm::ModulePass::getPotentialPassManagerType() 
     /// function.
     //------------------------------------------------------------------
-    virtual llvm::PassManagerType 
-    getPotentialPassManagerType() const;
+    llvm::PassManagerType
+    getPotentialPassManagerType() const override;
 
 private:
     //------------------------------------------------------------------

 
 };
 
-#endif
+#endif // liblldb_IRForTarget_h_

include/lldb/Initialization/SystemInitializerCommon.h

 {
   public:
     SystemInitializerCommon();
-    virtual ~SystemInitializerCommon();
+    ~SystemInitializerCommon() override;
 
     void Initialize() override;
     void Terminate() override;
 };
-}
 
-#endif
+} // namespace lldb_private
+
+#endif // LLDB_INITIALIZATION_SYSTEM_INITIALIZER_COMMON_H