Author: Jonas Devlieghere Date: 2020-06-15T21:34:13-07:00 New Revision: 388afd8406a07817b8663281bf3d06f87d46dfd7
URL: https://github.com/llvm/llvm-project/commit/388afd8406a07817b8663281bf3d06f87d46dfd7 DIFF: https://github.com/llvm/llvm-project/commit/388afd8406a07817b8663281bf3d06f87d46dfd7.diff LOG: [lldb] Remove redundant access specifiers (NFC) Added: Modified: lldb/include/lldb/Core/SearchFilter.h lldb/include/lldb/Core/ValueObjectChild.h lldb/include/lldb/DataFormatters/DumpValueObjectOptions.h lldb/include/lldb/DataFormatters/FormatClasses.h lldb/include/lldb/Host/Editline.h lldb/include/lldb/Host/MainLoopBase.h lldb/include/lldb/Symbol/DebugMacros.h lldb/include/lldb/Symbol/UnwindPlan.h lldb/include/lldb/Target/Process.h lldb/include/lldb/Target/Thread.h lldb/include/lldb/Target/ThreadPlan.h lldb/include/lldb/Utility/DataEncoder.h lldb/source/Commands/CommandObjectCommands.cpp lldb/source/Commands/CommandObjectFrame.cpp lldb/source/Commands/CommandObjectPlatform.cpp lldb/source/Commands/CommandObjectProcess.cpp lldb/source/Commands/CommandObjectThread.cpp lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.h lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.h lldb/source/Plugins/Language/ObjC/CFBasicHash.h lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h lldb/source/Plugins/Process/minidump/MinidumpParser.h lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/SearchFilter.h b/lldb/include/lldb/Core/SearchFilter.h index 9f56bbe40324..54dc65e4410f 100644 --- a/lldb/include/lldb/Core/SearchFilter.h +++ b/lldb/include/lldb/Core/SearchFilter.h @@ -398,7 +398,6 @@ class SearchFilterByModuleList : public SearchFilter { protected: lldb::SearchFilterSP DoCreateCopy() override; -protected: FileSpecList m_module_spec_list; }; diff --git a/lldb/include/lldb/Core/ValueObjectChild.h b/lldb/include/lldb/Core/ValueObjectChild.h index d8f395522443..c6f44a29b059 100644 --- a/lldb/include/lldb/Core/ValueObjectChild.h +++ b/lldb/include/lldb/Core/ValueObjectChild.h @@ -75,7 +75,6 @@ class ValueObjectChild : public ValueObject { // void // ReadValueFromMemory (ValueObject* parent, lldb::addr_t address); -protected: friend class ValueObject; friend class ValueObjectConstResult; friend class ValueObjectConstResultImpl; diff --git a/lldb/include/lldb/DataFormatters/DumpValueObjectOptions.h b/lldb/include/lldb/DataFormatters/DumpValueObjectOptions.h index 8bb3d8613598..2f3bdf80a6f1 100644 --- a/lldb/include/lldb/DataFormatters/DumpValueObjectOptions.h +++ b/lldb/include/lldb/DataFormatters/DumpValueObjectOptions.h @@ -127,7 +127,6 @@ class DumpValueObjectOptions { DumpValueObjectOptions & SetPointerAsArray(const PointerAsArraySettings &ptr_array); -public: uint32_t m_max_depth = UINT32_MAX; lldb::DynamicValueType m_use_dynamic = lldb::eNoDynamicValues; uint32_t m_omit_summary_depth = 0; diff --git a/lldb/include/lldb/DataFormatters/FormatClasses.h b/lldb/include/lldb/DataFormatters/FormatClasses.h index 05886e656cdb..e3989133a602 100644 --- a/lldb/include/lldb/DataFormatters/FormatClasses.h +++ b/lldb/include/lldb/DataFormatters/FormatClasses.h @@ -151,7 +151,6 @@ class TypeNameSpecifierImpl { }; TypeOrName m_type; -private: TypeNameSpecifierImpl(const TypeNameSpecifierImpl &) = delete; const TypeNameSpecifierImpl & operator=(const TypeNameSpecifierImpl &) = delete; diff --git a/lldb/include/lldb/Host/Editline.h b/lldb/include/lldb/Host/Editline.h index 6e9daae42217..356e8f734732 100644 --- a/lldb/include/lldb/Host/Editline.h +++ b/lldb/include/lldb/Host/Editline.h @@ -326,7 +326,6 @@ class Editline { void ApplyTerminalSizeChange(); -private: #if LLDB_EDITLINE_USE_WCHAR std::wstring_convert<std::codecvt_utf8<wchar_t>> m_utf8conv; #endif diff --git a/lldb/include/lldb/Host/MainLoopBase.h b/lldb/include/lldb/Host/MainLoopBase.h index cc816da4c25f..fa8cc77a94ba 100644 --- a/lldb/include/lldb/Host/MainLoopBase.h +++ b/lldb/include/lldb/Host/MainLoopBase.h @@ -79,7 +79,6 @@ class MainLoopBase { const ReadHandle &operator=(const ReadHandle &) = delete; }; -private: MainLoopBase(const MainLoopBase &) = delete; const MainLoopBase &operator=(const MainLoopBase &) = delete; }; diff --git a/lldb/include/lldb/Symbol/DebugMacros.h b/lldb/include/lldb/Symbol/DebugMacros.h index 0beb6b932637..0ea70f5deb84 100644 --- a/lldb/include/lldb/Symbol/DebugMacros.h +++ b/lldb/include/lldb/Symbol/DebugMacros.h @@ -27,7 +27,6 @@ class DebugMacroEntry { INVALID, DEFINE, UNDEF, START_FILE, END_FILE, INDIRECT }; -public: static DebugMacroEntry CreateDefineEntry(uint32_t line, const char *str); static DebugMacroEntry CreateUndefEntry(uint32_t line, const char *str); diff --git a/lldb/include/lldb/Symbol/UnwindPlan.h b/lldb/include/lldb/Symbol/UnwindPlan.h index d081b9ce730b..8902b5f4eaa7 100644 --- a/lldb/include/lldb/Symbol/UnwindPlan.h +++ b/lldb/include/lldb/Symbol/UnwindPlan.h @@ -320,7 +320,6 @@ class UnwindPlan { } m_value; }; // class FAValue - public: Row(); Row(const UnwindPlan::Row &rhs) = default; @@ -375,7 +374,6 @@ class UnwindPlan { collection m_register_locations; }; // class Row -public: typedef std::shared_ptr<Row> RowSP; UnwindPlan(lldb::RegisterKind reg_kind) diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h index 01e2a0d77111..a3fb3447169e 100644 --- a/lldb/include/lldb/Target/Process.h +++ b/lldb/include/lldb/Target/Process.h @@ -1331,7 +1331,6 @@ class Process : public std::enable_shared_from_this<Process>, virtual bool GetProcessInfo(ProcessInstanceInfo &info); -public: /// Get the exit status for a process. /// /// \return diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h index 75cc902b465a..205a0d965c63 100644 --- a/lldb/include/lldb/Target/Thread.h +++ b/lldb/include/lldb/Target/Thread.h @@ -1258,7 +1258,6 @@ class Thread : public std::enable_shared_from_this<Thread>, // for this thread? StructuredData::ObjectSP m_extended_info; // The extended info for this thread -private: void BroadcastSelectedFrameChange(StackID &new_frame_id); Thread(const Thread &) = delete; diff --git a/lldb/include/lldb/Target/ThreadPlan.h b/lldb/include/lldb/Target/ThreadPlan.h index 677286e9692e..8c2f9776eeb3 100644 --- a/lldb/include/lldb/Target/ThreadPlan.h +++ b/lldb/include/lldb/Target/ThreadPlan.h @@ -615,7 +615,6 @@ class ThreadPlan : public std::enable_shared_from_this<ThreadPlan>, lldb::ThreadPlanTracerSP m_tracer_sp; -private: ThreadPlan(const ThreadPlan &) = delete; const ThreadPlan &operator=(const ThreadPlan &) = delete; }; diff --git a/lldb/include/lldb/Utility/DataEncoder.h b/lldb/include/lldb/Utility/DataEncoder.h index 563fc7118530..8edec54c36f5 100644 --- a/lldb/include/lldb/Utility/DataEncoder.h +++ b/lldb/include/lldb/Utility/DataEncoder.h @@ -225,7 +225,6 @@ class DataEncoder { /// The total number of bytes of data this object refers to. size_t GetByteSize() const { return m_end - m_start; } -private: /// A pointer to the first byte of data. uint8_t *m_start; diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp index 8c78803ab159..d77e69c6f6a6 100644 --- a/lldb/source/Commands/CommandObjectCommands.cpp +++ b/lldb/source/Commands/CommandObjectCommands.cpp @@ -1621,7 +1621,6 @@ class CommandObjectCommandsScriptAdd : public CommandObjectParsed, io_handler.SetIsDone(true); } -protected: bool DoExecute(Args &command, CommandReturnObject &result) override { if (GetDebugger().GetScriptLanguage() != lldb::eScriptLanguagePython) { result.AppendError("only scripting language supported for scripted " diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index 4fef9f4847e0..5a61fc40e2e7 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -186,7 +186,6 @@ class CommandObjectFrameDiagnose : public CommandObjectParsed { return true; } -protected: CommandOptions m_options; }; @@ -379,7 +378,6 @@ class CommandObjectFrameSelect : public CommandObjectParsed { return result.Succeeded(); } -protected: CommandOptions m_options; }; @@ -714,7 +712,6 @@ class CommandObjectFrameVariable : public CommandObjectParsed { return res; } -protected: OptionGroupOptions m_option_group; OptionGroupVariable m_option_variable; OptionGroupFormat m_option_format; diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp index 103185a8839e..1fa9c2c23570 100644 --- a/lldb/source/Commands/CommandObjectPlatform.cpp +++ b/lldb/source/Commands/CommandObjectPlatform.cpp @@ -422,7 +422,6 @@ class CommandObjectPlatformSettings : public CommandObjectParsed { return &m_options; } -protected: OptionGroupOptions m_options; OptionGroupFile m_option_working_dir; }; @@ -1023,7 +1022,6 @@ class CommandObjectPlatformProcessLaunch : public CommandObjectParsed { return result.Succeeded(); } -protected: ProcessLaunchCommandOptions m_options; }; diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp index 4f591b53aaa6..aa90ad61225b 100644 --- a/lldb/source/Commands/CommandObjectProcess.cpp +++ b/lldb/source/Commands/CommandObjectProcess.cpp @@ -249,7 +249,6 @@ class CommandObjectProcessLaunch : public CommandObjectProcessLaunchOrAttach { return result.Succeeded(); } -protected: ProcessLaunchCommandOptions m_options; }; diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index fe86c9d34c6c..8e599ed69880 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -775,7 +775,6 @@ class CommandObjectThreadStepWithTypeAndScope : public CommandObjectParsed { return result.Succeeded(); } -protected: StepType m_step_type; StepScope m_step_scope; ThreadStepScopeOptionGroup m_options; diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.h b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.h index ed32eac2b4af..6ceec774914b 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.h +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.h @@ -144,7 +144,6 @@ class ClangASTImporter { void ForgetDestination(clang::ASTContext *dst_ctx); void ForgetSource(clang::ASTContext *dst_ctx, clang::ASTContext *src_ctx); -public: struct DeclOrigin { DeclOrigin() : ctx(nullptr), decl(nullptr) {} @@ -315,7 +314,6 @@ class ClangASTImporter { return delegate_iter->second; } -public: DeclOrigin GetDeclOrigin(const clang::Decl *decl); clang::FileManager m_file_manager; diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.h b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.h index 7de94e19b591..2563c6499de3 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.h +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.h @@ -333,7 +333,6 @@ class ClangASTSource : public clang::ExternalASTSource, /// global lookup for performance reasons. bool IgnoreName(const ConstString name, bool ignore_all_dollar_names); -public: /// Copies a single Decl into the parser's AST context. /// /// \param[in] src_decl diff --git a/lldb/source/Plugins/Language/ObjC/CFBasicHash.h b/lldb/source/Plugins/Language/ObjC/CFBasicHash.h index 94c2a1ac8a5f..fd30f5f7845f 100644 --- a/lldb/source/Plugins/Language/ObjC/CFBasicHash.h +++ b/lldb/source/Plugins/Language/ObjC/CFBasicHash.h @@ -60,7 +60,6 @@ class CFBasicHash { size_t GetPointerCount() const; -private: uint32_t m_ptr_size = UINT32_MAX; lldb::ByteOrder m_byte_order = lldb::eByteOrderInvalid; Address m_address = LLDB_INVALID_ADDRESS; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h index d9fe4903a47f..27aebd8594df 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h @@ -99,7 +99,6 @@ class AppleObjCTrampolineHandler { void Dump(Stream &s); - public: bool m_valid; AppleObjCVTables *m_owner; lldb::addr_t m_header_addr; diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h index 4cb016e7a0fe..c6cd1d407b9a 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h @@ -293,7 +293,6 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile { private: bool CreateBinary(); -private: dos_header_t m_dos_header; coff_header_t m_coff_header; coff_opt_header_t m_coff_header_opt; diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h b/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h index 067ac9c369ed..88c2ae7c5010 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h @@ -61,7 +61,6 @@ class RegisterInfoInterface { return nullptr; } -public: // FIXME make private. lldb_private::ArchSpec m_target_arch; }; diff --git a/lldb/source/Plugins/Process/minidump/MinidumpParser.h b/lldb/source/Plugins/Process/minidump/MinidumpParser.h index 2cf33b343b80..c4d7612b5f8d 100644 --- a/lldb/source/Plugins/Process/minidump/MinidumpParser.h +++ b/lldb/source/Plugins/Process/minidump/MinidumpParser.h @@ -100,7 +100,6 @@ class MinidumpParser { MinidumpParser(lldb::DataBufferSP data_sp, std::unique_ptr<llvm::object::MinidumpFile> file); -private: lldb::DataBufferSP m_data_sp; std::unique_ptr<llvm::object::MinidumpFile> m_file; ArchSpec m_arch; diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h index 06afbc060186..22f6c67eb7a5 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h @@ -321,7 +321,6 @@ class PythonObject { StructuredData::ObjectSP CreateStructuredObject() const; -public: template <typename... T> llvm::Expected<PythonObject> CallMethod(const char *name, const T &... t) const { _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
