maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[LLDB] Fix Clang-tidy misc-use-override warnings in some files in include/lldb/Core; other minor fixes. 

Summary:
This is second attempt based on current code.

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.

Patch by Eugene Zelenko.

Reviewers: labath, brucem, clayborg

Subscribers: amccarth, lldb-commits

Differential Revision: http://reviews.llvm.org/D13574

llvm-svn: 249928
This commit is contained in:
Bruce Mitchener 2015-10-10 01:11:45 +00:00
parent 78ab58077f
commit 8b7da6f1a9
14 changed files with 276 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/include/lldb/Core/Communication.h
View File

@ -100,7 +100,6 @@ public:
typedef void (*ReadThreadBytesReceived) (void *baton, const void *src, size_t src_len); typedef void (*ReadThreadBytesReceived) (void *baton, const void *src, size_t src_len);
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Construct the Communication object with the specified name for /// Construct the Communication object with the specified name for
/// the Broadcaster that this object inherits from. /// the Broadcaster that this object inherits from.
@ -118,8 +117,7 @@ public:
/// ///
/// The destructor is virtual since this class gets subclassed. /// The destructor is virtual since this class gets subclassed.
//------------------------------------------------------------------ //------------------------------------------------------------------
virtual ~Communication() override;
~Communication();
void void
Clear (); Clear ();
@ -177,6 +175,7 @@ public:
{ {
return m_connection_sp.get(); return m_connection_sp.get();
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Read bytes from the current connection. /// Read bytes from the current connection.
/// ///
@ -350,7 +349,7 @@ public:
static ConstString &GetStaticBroadcasterClass (); static ConstString &GetStaticBroadcasterClass ();
virtual ConstString &GetBroadcasterClass() const ConstString &GetBroadcasterClass() const override
{ {
return GetStaticBroadcasterClass(); return GetStaticBroadcasterClass();
} }
@ -361,7 +360,6 @@ private:
//------------------------------------------------------------------ //------------------------------------------------------------------
DISALLOW_COPY_AND_ASSIGN (Communication); DISALLOW_COPY_AND_ASSIGN (Communication);
protected: protected:
lldb::ConnectionSP m_connection_sp; ///< The connection that is current in use by this communications class. lldb::ConnectionSP m_connection_sp; ///< The connection that is current in use by this communications class.
HostThread m_read_thread; ///< The read thread handle in case we need to cancel the thread. HostThread m_read_thread; ///< The read thread handle in case we need to cancel the thread.
@ -381,6 +379,7 @@ protected:
uint32_t timeout_usec, uint32_t timeout_usec,
lldb::ConnectionStatus &status, lldb::ConnectionStatus &status,
Error *error_ptr); Error *error_ptr);
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Append new bytes that get read from the read thread into the /// Append new bytes that get read from the read thread into the
/// internal object byte cache. This will cause a \b /// internal object byte cache. This will cause a \b
@ -428,4 +427,4 @@ protected:
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_Communication_h_ #endif // liblldb_Communication_h_

27
lldb/include/lldb/Core/Debugger.h
View File

@ -9,8 +9,6 @@
#ifndef liblldb_Debugger_h_ #ifndef liblldb_Debugger_h_
#define liblldb_Debugger_h_ #define liblldb_Debugger_h_
#if defined(__cplusplus)
#include <stdint.h> #include <stdint.h>
@ -32,8 +30,8 @@ namespace llvm
namespace sys namespace sys
{ {
class DynamicLibrary; class DynamicLibrary;
} } // namespace sys
} } // namespace llvm
namespace lldb_private { namespace lldb_private {
@ -44,7 +42,6 @@ namespace lldb_private {
/// Provides a global root objects for the debugger core. /// Provides a global root objects for the debugger core.
//---------------------------------------------------------------------- //----------------------------------------------------------------------
class Debugger : class Debugger :
public std::enable_shared_from_this<Debugger>, public std::enable_shared_from_this<Debugger>,
public UserID, public UserID,
@ -79,8 +76,7 @@ public:
static void static void
Destroy (lldb::DebuggerSP &debugger_sp); Destroy (lldb::DebuggerSP &debugger_sp);
virtual ~Debugger() override;
~Debugger ();
void Clear(); void Clear();
@ -108,8 +104,6 @@ public:
return m_error_file_sp; return m_error_file_sp;
} }
void void
SetInputFileHandle (FILE *fh, bool tranfer_ownership); SetInputFileHandle (FILE *fh, bool tranfer_ownership);
@ -257,7 +251,6 @@ public:
void void
SetLoggingCallback (lldb::LogOutputCallback log_callback, void *baton); SetLoggingCallback (lldb::LogOutputCallback log_callback, void *baton);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Properties Functions // Properties Functions
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -268,11 +261,11 @@ public:
eStopDisassemblyTypeAlways eStopDisassemblyTypeAlways
}; };
virtual Error Error
SetPropertyValue (const ExecutionContext *exe_ctx, SetPropertyValue(const ExecutionContext *exe_ctx,
VarSetOperationType op, VarSetOperationType op,
const char *property_path, const char *property_path,
const char *value); const char *value) override;
bool bool
GetAutoConfirm () const; GetAutoConfirm () const;
@ -456,10 +449,8 @@ private:
Debugger (lldb::LogOutputCallback m_log_callback, void *baton); Debugger (lldb::LogOutputCallback m_log_callback, void *baton);
DISALLOW_COPY_AND_ASSIGN (Debugger); DISALLOW_COPY_AND_ASSIGN (Debugger);
}; };
} // namespace lldb_private } // namespace lldb_private
#endif // #if defined(__cplusplus) #endif // liblldb_Debugger_h_
#endif // liblldb_Debugger_h_

34
lldb/include/lldb/Core/Disassembler.h
View File

@ -48,6 +48,7 @@ public:
CalculateMnemonicOperandsAndCommentIfNeeded (exe_ctx); CalculateMnemonicOperandsAndCommentIfNeeded (exe_ctx);
return m_opcode_name.c_str(); return m_opcode_name.c_str();
} }
const char * const char *
GetOperands (const ExecutionContext* exe_ctx) GetOperands (const ExecutionContext* exe_ctx)
{ {
@ -127,7 +128,6 @@ public:
/// so this method can properly align the instruction opcodes. /// so this method can properly align the instruction opcodes.
/// May be 0 to indicate no indentation/alignment of the opcodes. /// May be 0 to indicate no indentation/alignment of the opcodes.
//------------------------------------------------------------------ //------------------------------------------------------------------
virtual void virtual void
Dump (Stream *s, Dump (Stream *s,
uint32_t max_opcode_byte_size, uint32_t max_opcode_byte_size,
@ -211,7 +211,6 @@ protected:
} }
}; };
class InstructionList class InstructionList
{ {
public: public:
@ -263,33 +262,32 @@ public:
PseudoInstruction (); PseudoInstruction ();
virtual ~PseudoInstruction() override;
~PseudoInstruction ();
virtual bool bool
DoesBranch (); DoesBranch() override;
virtual bool bool
HasDelaySlot (); HasDelaySlot() override;
virtual void void
CalculateMnemonicOperandsAndComment (const ExecutionContext* exe_ctx) CalculateMnemonicOperandsAndComment(const ExecutionContext* exe_ctx) override
{ {
// TODO: fill this in and put opcode name into Instruction::m_opcode_name, // TODO: fill this in and put opcode name into Instruction::m_opcode_name,
// mnemonic into Instruction::m_mnemonics, and any comment into // mnemonic into Instruction::m_mnemonics, and any comment into
// Instruction::m_comment // Instruction::m_comment
} }
virtual size_t size_t
Decode (const Disassembler &disassembler, Decode(const Disassembler &disassembler,
const DataExtractor &data, const DataExtractor &data,
lldb::offset_t data_offset); lldb::offset_t data_offset) override;
void void
SetOpcode (size_t opcode_size, void *opcode_data); SetOpcode (size_t opcode_size, void *opcode_data);
virtual void void
SetDescription (const char *description); SetDescription(const char *description) override;
protected: protected:
std::string m_description; std::string m_description;
@ -411,7 +409,7 @@ public:
// Constructors and Destructors // Constructors and Destructors
//------------------------------------------------------------------ //------------------------------------------------------------------
Disassembler(const ArchSpec &arch, const char *flavor); Disassembler(const ArchSpec &arch, const char *flavor);
virtual ~Disassembler(); ~Disassembler() override;
typedef const char * (*SummaryCallback)(const Instruction& inst, ExecutionContext *exe_context, void *user_data); typedef const char * (*SummaryCallback)(const Instruction& inst, ExecutionContext *exe_context, void *user_data);
@ -484,4 +482,4 @@ private:
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_Disassembler_h_ #endif // liblldb_Disassembler_h_

16
lldb/include/lldb/Core/EmulateInstruction.h
View File

@ -19,6 +19,8 @@
#include "lldb/Core/Opcode.h" #include "lldb/Core/Opcode.h"
#include "lldb/Core/RegisterValue.h" #include "lldb/Core/RegisterValue.h"
namespace lldb_private {
//---------------------------------------------------------------------- //----------------------------------------------------------------------
/// @class EmulateInstruction EmulateInstruction.h "lldb/Core/EmulateInstruction.h" /// @class EmulateInstruction EmulateInstruction.h "lldb/Core/EmulateInstruction.h"
/// @brief A class that allows emulation of CPU opcodes. /// @brief A class that allows emulation of CPU opcodes.
@ -79,8 +81,6 @@
/// and emulating the instruction is just a bonus. /// and emulating the instruction is just a bonus.
//---------------------------------------------------------------------- //----------------------------------------------------------------------
namespace lldb_private {
class EmulateInstruction : class EmulateInstruction :
public PluginInterface public PluginInterface
{ {
@ -233,7 +233,6 @@ public:
} ISAAndImmediateSigned; } ISAAndImmediateSigned;
uint32_t isa; uint32_t isa;
} info; } info;
Context () : Context () :
@ -387,9 +386,8 @@ public:
EmulateInstruction (const ArchSpec &arch); EmulateInstruction (const ArchSpec &arch);
virtual ~EmulateInstruction() ~EmulateInstruction() override = default;
{
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Mandatory overrides // Mandatory overrides
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -530,7 +528,6 @@ public:
return m_arch; return m_arch;
} }
static size_t static size_t
ReadMemoryFrame (EmulateInstruction *instruction, ReadMemoryFrame (EmulateInstruction *instruction,
void *baton, void *baton,
@ -631,7 +628,6 @@ protected:
lldb::addr_t m_addr; lldb::addr_t m_addr;
Opcode m_opcode; Opcode m_opcode;
private: private:
//------------------------------------------------------------------ //------------------------------------------------------------------
// For EmulateInstruction only // For EmulateInstruction only
@ -639,6 +635,6 @@ private:
DISALLOW_COPY_AND_ASSIGN (EmulateInstruction); DISALLOW_COPY_AND_ASSIGN (EmulateInstruction);
}; };
} // namespace lldb_private } // namespace lldb_private
#endif // lldb_EmulateInstruction_h_ #endif // lldb_EmulateInstruction_h_

33
lldb/include/lldb/Core/IOHandler.h
View File

@ -29,7 +29,7 @@ namespace curses
{ {
class Application; class Application;
typedef std::unique_ptr<Application> ApplicationAP; typedef std::unique_ptr<Application> ApplicationAP;
} } // namespace curses
namespace lldb_private { namespace lldb_private {
@ -257,7 +257,6 @@ namespace lldb_private {
private: private:
DISALLOW_COPY_AND_ASSIGN (IOHandler); DISALLOW_COPY_AND_ASSIGN (IOHandler);
}; };
//------------------------------------------------------------------ //------------------------------------------------------------------
/// A delegate class for use with IOHandler subclasses. /// A delegate class for use with IOHandler subclasses.
@ -283,9 +282,7 @@ namespace lldb_private {
} }
virtual virtual
~IOHandlerDelegate() ~IOHandlerDelegate() = default;
{
}
virtual void virtual void
IOHandlerActivated (IOHandler &io_handler) IOHandlerActivated (IOHandler &io_handler)
@ -415,6 +412,7 @@ namespace lldb_private {
{ {
return false; return false;
} }
protected: protected:
Completion m_completion; // Support for common builtin completions Completion m_completion; // Support for common builtin completions
bool m_io_handler_done; bool m_io_handler_done;
@ -438,10 +436,7 @@ namespace lldb_private {
{ {
} }
virtual ~IOHandlerDelegateMultiline() override = default;
~IOHandlerDelegateMultiline ()
{
}
ConstString ConstString
IOHandlerGetControlSequence (char ch) override IOHandlerGetControlSequence (char ch) override
@ -467,11 +462,11 @@ namespace lldb_private {
} }
return false; return false;
} }
protected: protected:
const std::string m_end_line; const std::string m_end_line;
}; };
class IOHandlerEditline : public IOHandler class IOHandlerEditline : public IOHandler
{ {
public: public:
@ -499,8 +494,7 @@ namespace lldb_private {
uint32_t line_number_start, // If non-zero show line numbers starting at 'line_number_start' uint32_t line_number_start, // If non-zero show line numbers starting at 'line_number_start'
IOHandlerDelegate &delegate); IOHandlerDelegate &delegate);
virtual ~IOHandlerEditline() override;
~IOHandlerEditline ();
void void
Run () override; Run () override;
@ -632,8 +626,7 @@ namespace lldb_private {
const char *prompt, const char *prompt,
bool default_response); bool default_response);
virtual ~IOHandlerConfirm() override;
~IOHandlerConfirm ();
bool bool
GetResponse () const GetResponse () const
@ -694,14 +687,14 @@ namespace lldb_private {
public: public:
IOHandlerCursesValueObjectList (Debugger &debugger, ValueObjectList &valobj_list); IOHandlerCursesValueObjectList (Debugger &debugger, ValueObjectList &valobj_list);
virtual ~IOHandlerCursesValueObjectList() override;
~IOHandlerCursesValueObjectList ();
void void
Run () override; Run () override;
void void
GotEOF() override; GotEOF() override;
protected: protected:
ValueObjectList m_valobj_list; ValueObjectList m_valobj_list;
}; };
@ -717,9 +710,7 @@ namespace lldb_private {
{ {
} }
~IOHandlerStack () ~IOHandlerStack() = default;
{
}
size_t size_t
GetSize () const GetSize () const
@ -830,17 +821,15 @@ namespace lldb_private {
PrintAsync (Stream *stream, const char *s, size_t len); PrintAsync (Stream *stream, const char *s, size_t len);
protected: protected:
typedef std::vector<lldb::IOHandlerSP> collection; typedef std::vector<lldb::IOHandlerSP> collection;
collection m_stack; collection m_stack;
mutable Mutex m_mutex; mutable Mutex m_mutex;
IOHandler *m_top; IOHandler *m_top;
private: private:
DISALLOW_COPY_AND_ASSIGN (IOHandlerStack); DISALLOW_COPY_AND_ASSIGN (IOHandlerStack);
}; };
} // namespace lldb_private } // namespace lldb_private
#endif // #ifndef liblldb_IOHandler_h_ #endif // liblldb_IOHandler_h_

6
lldb/include/lldb/Core/Log.h
View File

@ -182,13 +182,12 @@ private:
DISALLOW_COPY_AND_ASSIGN(Log); DISALLOW_COPY_AND_ASSIGN(Log);
}; };
class LogChannel : public PluginInterface class LogChannel : public PluginInterface
{ {
public: public:
LogChannel(); LogChannel();
virtual ~LogChannel(); ~LogChannel() override;
static lldb::LogChannelSP FindPlugin(const char *plugin_name); static lldb::LogChannelSP FindPlugin(const char *plugin_name);
@ -209,7 +208,6 @@ private:
DISALLOW_COPY_AND_ASSIGN(LogChannel); DISALLOW_COPY_AND_ASSIGN(LogChannel);
}; };
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_Log_H_ #endif // liblldb_Log_h_

24
lldb/include/lldb/Core/Module.h
View File

@ -11,6 +11,7 @@
#define liblldb_Module_h_ #define liblldb_Module_h_
#include <atomic> #include <atomic>
#include "lldb/lldb-forward.h" #include "lldb/lldb-forward.h"
#include "lldb/Core/ArchSpec.h" #include "lldb/Core/ArchSpec.h"
#include "lldb/Core/UUID.h" #include "lldb/Core/UUID.h"
@ -101,8 +102,7 @@ public:
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Destructor. /// Destructor.
//------------------------------------------------------------------ //------------------------------------------------------------------
virtual ~Module() override;
~Module ();
bool bool
MatchesModuleSpec (const ModuleSpec &module_ref); MatchesModuleSpec (const ModuleSpec &module_ref);
@ -156,11 +156,11 @@ public:
/// ///
/// @see SymbolContextScope /// @see SymbolContextScope
//------------------------------------------------------------------ //------------------------------------------------------------------
virtual void void
CalculateSymbolContext (SymbolContext* sc); CalculateSymbolContext(SymbolContext* sc) override;
virtual lldb::ModuleSP lldb::ModuleSP
CalculateSymbolContextModule (); CalculateSymbolContextModule() override;
void void
GetDescription (Stream *s, GetDescription (Stream *s,
@ -209,10 +209,9 @@ public:
/// ///
/// @see SymbolContextScope /// @see SymbolContextScope
//------------------------------------------------------------------ //------------------------------------------------------------------
virtual void void
DumpSymbolContext (Stream *s); DumpSymbolContext(Stream *s) override;
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Find a symbol in the object file's symbol table. /// Find a symbol in the object file's symbol table.
/// ///
@ -290,7 +289,6 @@ public:
FindCompileUnits (const FileSpec &path, FindCompileUnits (const FileSpec &path,
bool append, bool append,
SymbolContextList &sc_list); SymbolContextList &sc_list);
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Find functions by name. /// Find functions by name.
@ -937,7 +935,6 @@ public:
uint32_t uint32_t
ResolveSymbolContextsForFileSpec (const FileSpec &file_spec, uint32_t line, bool check_inlines, uint32_t resolve_scope, SymbolContextList& sc_list); ResolveSymbolContextsForFileSpec (const FileSpec &file_spec, uint32_t line, bool check_inlines, uint32_t resolve_scope, SymbolContextList& sc_list);
void void
SetFileSpecAndObjectName (const FileSpec &file, SetFileSpecAndObjectName (const FileSpec &file,
const ConstString &object_name); const ConstString &object_name);
@ -1043,7 +1040,6 @@ public:
bool bool
RemapSourceFile (const char *path, std::string &new_path) const; RemapSourceFile (const char *path, std::string &new_path) const;
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Prepare to do a function name lookup. /// Prepare to do a function name lookup.
/// ///
@ -1184,7 +1180,6 @@ protected:
friend class SymbolFile; friend class SymbolFile;
private: private:
Module (); // Only used internally by CreateJITModule () Module (); // Only used internally by CreateJITModule ()
size_t size_t
@ -1195,10 +1190,9 @@ private:
size_t max_matches, size_t max_matches,
TypeMap& types); TypeMap& types);
DISALLOW_COPY_AND_ASSIGN (Module); DISALLOW_COPY_AND_ASSIGN (Module);
}; };
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_Module_h_ #endif // liblldb_Module_h_

14
lldb/include/lldb/Core/SearchFilter.h
View File

@ -272,7 +272,7 @@ class SearchFilterForUnconstrainedSearches :
{ {
public: public:
SearchFilterForUnconstrainedSearches (const lldb::TargetSP &target_sp) : SearchFilter(target_sp) {} SearchFilterForUnconstrainedSearches (const lldb::TargetSP &target_sp) : SearchFilter(target_sp) {}
~SearchFilterForUnconstrainedSearches () {} ~SearchFilterForUnconstrainedSearches() override = default;
bool bool
ModulePasses (const FileSpec &module_spec) override; ModulePasses (const FileSpec &module_spec) override;
@ -283,7 +283,6 @@ public:
protected: protected:
lldb::SearchFilterSP lldb::SearchFilterSP
DoCopyForBreakpoint (Breakpoint &breakpoint) override; DoCopyForBreakpoint (Breakpoint &breakpoint) override;
}; };
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -311,8 +310,7 @@ public:
SearchFilterByModule (const SearchFilterByModule& rhs); SearchFilterByModule (const SearchFilterByModule& rhs);
virtual ~SearchFilterByModule() override;
~SearchFilterByModule ();
const SearchFilterByModule& const SearchFilterByModule&
operator=(const SearchFilterByModule& rhs); operator=(const SearchFilterByModule& rhs);
@ -372,8 +370,7 @@ public:
SearchFilterByModuleList (const SearchFilterByModuleList& rhs); SearchFilterByModuleList (const SearchFilterByModuleList& rhs);
virtual ~SearchFilterByModuleList() override;
~SearchFilterByModuleList ();
const SearchFilterByModuleList& const SearchFilterByModuleList&
operator=(const SearchFilterByModuleList& rhs); operator=(const SearchFilterByModuleList& rhs);
@ -434,8 +431,7 @@ public:
SearchFilterByModuleListAndCU (const SearchFilterByModuleListAndCU& rhs); SearchFilterByModuleListAndCU (const SearchFilterByModuleListAndCU& rhs);
virtual ~SearchFilterByModuleListAndCU() override;
~SearchFilterByModuleListAndCU ();
const SearchFilterByModuleListAndCU& const SearchFilterByModuleListAndCU&
operator=(const SearchFilterByModuleListAndCU& rhs); operator=(const SearchFilterByModuleListAndCU& rhs);
@ -472,4 +468,4 @@ private:
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_SearchFilter_h_ #endif // liblldb_SearchFilter_h_

5
lldb/include/lldb/Core/StreamGDBRemote.h
View File

@ -29,8 +29,7 @@ namespace lldb_private {
uint32_t addr_size, uint32_t addr_size,
lldb::ByteOrder byte_order); lldb::ByteOrder byte_order);
virtual ~StreamGDBRemote() override;
~StreamGDBRemote ();
//------------------------------------------------------------------ //------------------------------------------------------------------
/// Output a block of data to the stream performing GDB-remote escaping. /// Output a block of data to the stream performing GDB-remote escaping.
@ -51,4 +50,4 @@ namespace lldb_private {
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_StreamGDBRemote_h_ #endif // liblldb_StreamGDBRemote_h_

63
lldb/include/lldb/Core/ValueObjectChild.h
View File

@ -26,71 +26,71 @@ namespace lldb_private {
class ValueObjectChild : public ValueObject class ValueObjectChild : public ValueObject
{ {
public: public:
virtual ~ValueObjectChild(); ~ValueObjectChild() override;
virtual uint64_t uint64_t
GetByteSize() GetByteSize() override
{ {
return m_byte_size; return m_byte_size;
} }
virtual lldb::offset_t lldb::offset_t
GetByteOffset() GetByteOffset() override
{ {
return m_byte_offset; return m_byte_offset;
} }
virtual uint32_t uint32_t
GetBitfieldBitSize() GetBitfieldBitSize() override
{ {
return m_bitfield_bit_size; return m_bitfield_bit_size;
} }
virtual uint32_t uint32_t
GetBitfieldBitOffset() GetBitfieldBitOffset() override
{ {
return m_bitfield_bit_offset; return m_bitfield_bit_offset;
} }
virtual lldb::ValueType lldb::ValueType
GetValueType() const; GetValueType() const override;
virtual size_t size_t
CalculateNumChildren(); CalculateNumChildren() override;
virtual ConstString ConstString
GetTypeName(); GetTypeName() override;
virtual ConstString ConstString
GetQualifiedTypeName(); GetQualifiedTypeName() override;
virtual ConstString ConstString
GetDisplayTypeName(); GetDisplayTypeName() override;
virtual bool bool
IsInScope (); IsInScope() override;
virtual bool bool
IsBaseClass () IsBaseClass() override
{ {
return m_is_base_class; return m_is_base_class;
} }
virtual bool bool
IsDereferenceOfParent () IsDereferenceOfParent() override
{ {
return m_is_deref_of_parent; return m_is_deref_of_parent;
} }
protected: protected:
virtual bool bool
UpdateValue (); UpdateValue() override;
virtual LazyBool LazyBool
CanUpdateWithInvalidExecutionContext (); CanUpdateWithInvalidExecutionContext() override;
virtual CompilerType CompilerType
GetCompilerTypeImpl () GetCompilerTypeImpl() override
{ {
return m_compiler_type; return m_compiler_type;
} }
@ -113,6 +113,7 @@ protected:
friend class ValueObject; friend class ValueObject;
friend class ValueObjectConstResult; friend class ValueObjectConstResult;
friend class ValueObjectConstResultImpl; friend class ValueObjectConstResultImpl;
ValueObjectChild (ValueObject &parent, ValueObjectChild (ValueObject &parent,
const CompilerType &compiler_type, const CompilerType &compiler_type,
const ConstString &name, const ConstString &name,

90
lldb/include/lldb/Core/ValueObjectConstResult.h
View File

@ -26,6 +26,8 @@ namespace lldb_private {
class ValueObjectConstResult : public ValueObject class ValueObjectConstResult : public ValueObject
{ {
public: public:
~ValueObjectConstResult() override;
static lldb::ValueObjectSP static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope, Create (ExecutionContextScope *exe_scope,
lldb::ByteOrder byte_order, lldb::ByteOrder byte_order,
@ -67,79 +69,76 @@ public:
Create (ExecutionContextScope *exe_scope, Create (ExecutionContextScope *exe_scope,
const Error& error); const Error& error);
virtual ~ValueObjectConstResult(); uint64_t
GetByteSize() override;
virtual uint64_t lldb::ValueType
GetByteSize(); GetValueType() const override;
virtual lldb::ValueType size_t
GetValueType() const; CalculateNumChildren() override;
virtual size_t ConstString
CalculateNumChildren(); GetTypeName() override;
virtual ConstString ConstString
GetTypeName(); GetDisplayTypeName() override;
virtual ConstString
GetDisplayTypeName();
virtual bool bool
IsInScope (); IsInScope() override;
void void
SetByteSize (size_t size); SetByteSize (size_t size);
virtual lldb::ValueObjectSP lldb::ValueObjectSP
Dereference (Error &error); Dereference(Error &error) override;
virtual ValueObject * ValueObject *
CreateChildAtIndex (size_t idx, bool synthetic_array_member, int32_t synthetic_index); CreateChildAtIndex(size_t idx, bool synthetic_array_member, int32_t synthetic_index) override;
virtual lldb::ValueObjectSP lldb::ValueObjectSP
GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create); GetSyntheticChildAtOffset(uint32_t offset, const CompilerType& type, bool can_create) override;
virtual lldb::ValueObjectSP lldb::ValueObjectSP
AddressOf (Error &error); AddressOf(Error &error) override;
virtual lldb::addr_t lldb::addr_t
GetAddressOf (bool scalar_is_load_address = true, GetAddressOf(bool scalar_is_load_address = true,
AddressType *address_type = NULL); AddressType *address_type = NULL) override;
virtual size_t size_t
GetPointeeData (DataExtractor& data, GetPointeeData(DataExtractor& data,
uint32_t item_idx = 0, uint32_t item_idx = 0,
uint32_t item_count = 1); uint32_t item_count = 1) override;
virtual lldb::addr_t lldb::addr_t
GetLiveAddress() GetLiveAddress() override
{ {
return m_impl.GetLiveAddress(); return m_impl.GetLiveAddress();
} }
virtual void void
SetLiveAddress(lldb::addr_t addr = LLDB_INVALID_ADDRESS, SetLiveAddress(lldb::addr_t addr = LLDB_INVALID_ADDRESS,
AddressType address_type = eAddressTypeLoad) AddressType address_type = eAddressTypeLoad) override
{ {
m_impl.SetLiveAddress(addr, m_impl.SetLiveAddress(addr, address_type);
address_type);
} }
virtual lldb::ValueObjectSP lldb::ValueObjectSP
GetDynamicValue (lldb::DynamicValueType valueType); GetDynamicValue(lldb::DynamicValueType valueType) override;
virtual lldb::LanguageType lldb::LanguageType
GetPreferredDisplayLanguage (); GetPreferredDisplayLanguage() override;
virtual lldb::ValueObjectSP lldb::ValueObjectSP
Cast (const CompilerType &compiler_type); Cast(const CompilerType &compiler_type) override;
protected: protected:
virtual bool bool
UpdateValue (); UpdateValue() override;
virtual CompilerType CompilerType
GetCompilerTypeImpl (); GetCompilerTypeImpl() override;
ConstString m_type_name; ConstString m_type_name;
uint64_t m_byte_size; uint64_t m_byte_size;
@ -148,6 +147,7 @@ protected:
private: private:
friend class ValueObjectConstResultImpl; friend class ValueObjectConstResultImpl;
ValueObjectConstResult (ExecutionContextScope *exe_scope, ValueObjectConstResult (ExecutionContextScope *exe_scope,
lldb::ByteOrder byte_order, lldb::ByteOrder byte_order,
uint32_t addr_byte_size, uint32_t addr_byte_size,

93
lldb/include/lldb/Core/ValueObjectDynamicValue.h
View File

@ -26,44 +26,43 @@ namespace lldb_private {
class ValueObjectDynamicValue : public ValueObject class ValueObjectDynamicValue : public ValueObject
{ {
public: public:
virtual ~ValueObjectDynamicValue() override;
~ValueObjectDynamicValue();
virtual uint64_t uint64_t
GetByteSize(); GetByteSize() override;
virtual ConstString ConstString
GetTypeName(); GetTypeName() override;
virtual ConstString ConstString
GetQualifiedTypeName(); GetQualifiedTypeName() override;
virtual ConstString ConstString
GetDisplayTypeName(); GetDisplayTypeName() override;
virtual size_t size_t
CalculateNumChildren(); CalculateNumChildren() override;
virtual lldb::ValueType lldb::ValueType
GetValueType() const; GetValueType() const override;
virtual bool bool
IsInScope (); IsInScope() override;
virtual bool bool
IsDynamic () IsDynamic() override
{ {
return true; return true;
} }
virtual bool bool
GetIsConstant () const GetIsConstant() const override
{ {
return false; return false;
} }
virtual ValueObject * ValueObject *
GetParent() GetParent() override
{ {
if (m_parent) if (m_parent)
return m_parent->GetParent(); return m_parent->GetParent();
@ -71,8 +70,8 @@ public:
return NULL; return NULL;
} }
virtual const ValueObject * const ValueObject *
GetParent() const GetParent() const override
{ {
if (m_parent) if (m_parent)
return m_parent->GetParent(); return m_parent->GetParent();
@ -80,8 +79,8 @@ public:
return NULL; return NULL;
} }
virtual lldb::ValueObjectSP lldb::ValueObjectSP
GetStaticValue () GetStaticValue() override
{ {
return m_parent->GetSP(); return m_parent->GetSP();
} }
@ -96,48 +95,48 @@ public:
m_owning_valobj_sp = owning_sp; m_owning_valobj_sp = owning_sp;
} }
virtual bool bool
SetValueFromCString (const char *value_str, Error& error); SetValueFromCString(const char *value_str, Error& error) override;
virtual bool bool
SetData (DataExtractor &data, Error &error); SetData(DataExtractor &data, Error &error) override;
virtual TypeImpl TypeImpl
GetTypeImpl (); GetTypeImpl() override;
virtual lldb::LanguageType lldb::LanguageType
GetPreferredDisplayLanguage (); GetPreferredDisplayLanguage() override;
void void
SetPreferredDisplayLanguage (lldb::LanguageType); SetPreferredDisplayLanguage (lldb::LanguageType);
virtual bool bool
GetDeclaration (Declaration &decl); GetDeclaration(Declaration &decl) override;
protected: protected:
virtual bool bool
UpdateValue (); UpdateValue() override;
virtual LazyBool LazyBool
CanUpdateWithInvalidExecutionContext () CanUpdateWithInvalidExecutionContext() override
{ {
return eLazyBoolYes; return eLazyBoolYes;
} }
virtual lldb::DynamicValueType lldb::DynamicValueType
GetDynamicValueTypeImpl () GetDynamicValueTypeImpl() override
{ {
return m_use_dynamic; return m_use_dynamic;
} }
virtual bool bool
HasDynamicValueTypeInfo () HasDynamicValueTypeInfo() override
{ {
return true; return true;
} }
virtual CompilerType CompilerType
GetCompilerTypeImpl (); GetCompilerTypeImpl() override;
Address m_address; ///< The variable that this value object is based upon Address m_address; ///< The variable that this value object is based upon
TypeAndOrName m_dynamic_type_info; // We can have a type_sp or just a name TypeAndOrName m_dynamic_type_info; // We can have a type_sp or just a name
@ -158,4 +157,4 @@ private:
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_ValueObjectDynamicValue_h_ #endif // liblldb_ValueObjectDynamicValue_h_

43
lldb/include/lldb/Core/ValueObjectMemory.h
View File

@ -26,6 +26,8 @@ namespace lldb_private {
class ValueObjectMemory : public ValueObject class ValueObjectMemory : public ValueObject
{ {
public: public:
~ValueObjectMemory() override;
static lldb::ValueObjectSP static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope, Create (ExecutionContextScope *exe_scope,
const char *name, const char *name,
@ -38,36 +40,33 @@ public:
const Address &address, const Address &address,
const CompilerType &ast_type); const CompilerType &ast_type);
virtual uint64_t
~ValueObjectMemory(); GetByteSize() override;
virtual uint64_t ConstString
GetByteSize(); GetTypeName() override;
virtual ConstString ConstString
GetTypeName(); GetDisplayTypeName() override;
virtual ConstString
GetDisplayTypeName();
virtual size_t size_t
CalculateNumChildren(); CalculateNumChildren() override;
virtual lldb::ValueType lldb::ValueType
GetValueType() const; GetValueType() const override;
virtual bool bool
IsInScope (); IsInScope() override;
virtual lldb::ModuleSP lldb::ModuleSP
GetModule(); GetModule() override;
protected: protected:
virtual bool bool
UpdateValue (); UpdateValue() override;
virtual CompilerType CompilerType
GetCompilerTypeImpl (); GetCompilerTypeImpl() override;
Address m_address; ///< The variable that this value object is based upon Address m_address; ///< The variable that this value object is based upon
lldb::TypeSP m_type_sp; lldb::TypeSP m_type_sp;
@ -91,4 +90,4 @@ private:
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_ValueObjectMemory_h_ #endif // liblldb_ValueObjectMemory_h_

136
lldb/include/lldb/Core/ValueObjectRegister.h
View File

@ -27,40 +27,38 @@ namespace lldb_private {
class ValueObjectRegisterContext : public ValueObject class ValueObjectRegisterContext : public ValueObject
{ {
public: public:
~ValueObjectRegisterContext() override;
virtual uint64_t
~ValueObjectRegisterContext(); GetByteSize() override;
virtual uint64_t lldb::ValueType
GetByteSize(); GetValueType() const override
virtual lldb::ValueType
GetValueType () const
{ {
return lldb::eValueTypeRegisterSet; return lldb::eValueTypeRegisterSet;
} }
virtual ConstString ConstString
GetTypeName(); GetTypeName() override;
virtual ConstString ConstString
GetQualifiedTypeName(); GetQualifiedTypeName() override;
virtual ConstString ConstString
GetDisplayTypeName(); GetDisplayTypeName() override;
virtual size_t size_t
CalculateNumChildren(); CalculateNumChildren() override;
virtual ValueObject * ValueObject *
CreateChildAtIndex (size_t idx, bool synthetic_array_member, int32_t synthetic_index); CreateChildAtIndex(size_t idx, bool synthetic_array_member, int32_t synthetic_index) override;
protected: protected:
virtual bool bool
UpdateValue (); UpdateValue() override;
virtual CompilerType CompilerType
GetCompilerTypeImpl (); GetCompilerTypeImpl() override;
lldb::RegisterContextSP m_reg_ctx_sp; lldb::RegisterContextSP m_reg_ctx_sp;
@ -75,46 +73,44 @@ private:
class ValueObjectRegisterSet : public ValueObject class ValueObjectRegisterSet : public ValueObject
{ {
public: public:
~ValueObjectRegisterSet() override;
static lldb::ValueObjectSP static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t set_idx); Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t set_idx);
virtual uint64_t
~ValueObjectRegisterSet(); GetByteSize() override;
virtual uint64_t lldb::ValueType
GetByteSize(); GetValueType() const override
virtual lldb::ValueType
GetValueType () const
{ {
return lldb::eValueTypeRegisterSet; return lldb::eValueTypeRegisterSet;
} }
virtual ConstString ConstString
GetTypeName(); GetTypeName() override;
virtual ConstString ConstString
GetQualifiedTypeName(); GetQualifiedTypeName() override;
virtual size_t size_t
CalculateNumChildren(); CalculateNumChildren() override;
virtual ValueObject * ValueObject *
CreateChildAtIndex (size_t idx, bool synthetic_array_member, int32_t synthetic_index); CreateChildAtIndex(size_t idx, bool synthetic_array_member, int32_t synthetic_index) override;
virtual lldb::ValueObjectSP lldb::ValueObjectSP
GetChildMemberWithName (const ConstString &name, bool can_create); GetChildMemberWithName(const ConstString &name, bool can_create) override;
virtual size_t
GetIndexOfChildWithName (const ConstString &name);
size_t
GetIndexOfChildWithName(const ConstString &name) override;
protected: protected:
virtual bool bool
UpdateValue (); UpdateValue() override;
virtual CompilerType CompilerType
GetCompilerTypeImpl (); GetCompilerTypeImpl() override;
lldb::RegisterContextSP m_reg_ctx_sp; lldb::RegisterContextSP m_reg_ctx_sp;
const RegisterSet *m_reg_set; const RegisterSet *m_reg_set;
@ -122,6 +118,7 @@ protected:
private: private:
friend class ValueObjectRegisterContext; friend class ValueObjectRegisterContext;
ValueObjectRegisterSet (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t set_idx); ValueObjectRegisterSet (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t set_idx);
//------------------------------------------------------------------ //------------------------------------------------------------------
@ -133,45 +130,45 @@ private:
class ValueObjectRegister : public ValueObject class ValueObjectRegister : public ValueObject
{ {
public: public:
~ValueObjectRegister() override;
static lldb::ValueObjectSP static lldb::ValueObjectSP
Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t reg_num); Create (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t reg_num);
virtual uint64_t
~ValueObjectRegister(); GetByteSize() override;
virtual uint64_t lldb::ValueType
GetByteSize(); GetValueType() const override
virtual lldb::ValueType
GetValueType () const
{ {
return lldb::eValueTypeRegister; return lldb::eValueTypeRegister;
} }
virtual ConstString ConstString
GetTypeName(); GetTypeName() override;
virtual size_t size_t
CalculateNumChildren(); CalculateNumChildren() override;
virtual bool bool
SetValueFromCString (const char *value_str, Error& error); SetValueFromCString(const char *value_str, Error& error) override;
virtual bool bool
SetData (DataExtractor &data, Error &error); SetData(DataExtractor &data, Error &error) override;
virtual bool bool
ResolveValue (Scalar &scalar); ResolveValue(Scalar &scalar) override;
virtual void void
GetExpressionPath (Stream &s, bool qualify_cxx_base_classes, GetExpressionPathFormat epformat = eGetExpressionPathFormatDereferencePointers); GetExpressionPath(Stream &s, bool qualify_cxx_base_classes,
GetExpressionPathFormat epformat = eGetExpressionPathFormatDereferencePointers) override;
protected: protected:
virtual bool bool
UpdateValue (); UpdateValue() override;
virtual CompilerType CompilerType
GetCompilerTypeImpl (); GetCompilerTypeImpl() override;
lldb::RegisterContextSP m_reg_ctx_sp; lldb::RegisterContextSP m_reg_ctx_sp;
RegisterInfo m_reg_info; RegisterInfo m_reg_info;
@ -184,6 +181,7 @@ private:
ConstructObject (uint32_t reg_num); ConstructObject (uint32_t reg_num);
friend class ValueObjectRegisterSet; friend class ValueObjectRegisterSet;
ValueObjectRegister (ValueObject &parent, lldb::RegisterContextSP &reg_ctx_sp, uint32_t reg_num); ValueObjectRegister (ValueObject &parent, lldb::RegisterContextSP &reg_ctx_sp, uint32_t reg_num);
ValueObjectRegister (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t reg_num); ValueObjectRegister (ExecutionContextScope *exe_scope, lldb::RegisterContextSP &reg_ctx_sp, uint32_t reg_num);
@ -195,4 +193,4 @@ private:
} // namespace lldb_private } // namespace lldb_private
#endif // liblldb_ValueObjectRegister_h_ #endif // liblldb_ValueObjectRegister_h_