Skip to content

Commit

Permalink
[lldb][NFC] Add 'override' where missing in source/ and tools/
Browse files Browse the repository at this point in the history 
These were found by Clang's new -Wsuggest-override.

This patch doesn't touch any code in unittests/, since much of it intentionally doesn't use override to avoid massive warning spam from -Winconsistent-missing-override due to the use of MOCK_*** macros.

Differential Revision: https://reviews.llvm.org/D83847
  • Loading branch information
@kepler-5
kepler-5 committed Jul 15, 2020
1 parent 268025e commit 44b43a5
Show file tree
Hide file tree
Showing 13 changed files with 133 additions and 133 deletions.
4 changes: 2 additions & 2 deletions lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
View file
Expand Up @@ -873,7 +873,7 @@ class CommandObjectProcessKDPPacketSend : public CommandObjectParsed {
OptionGroupUInt64 m_command_byte;
OptionGroupString m_packet_data;

virtual Options *GetOptions() { return &m_option_group; }
Options *GetOptions() override { return &m_option_group; }

public:
CommandObjectProcessKDPPacketSend(CommandInterpreter &interpreter)
Expand All @@ -900,7 +900,7 @@ class CommandObjectProcessKDPPacketSend : public CommandObjectParsed {

~CommandObjectProcessKDPPacketSend() {}

bool DoExecute(Args &command, CommandReturnObject &result) {
bool DoExecute(Args &command, CommandReturnObject &result) override {
const size_t argc = command.GetArgumentCount();
if (argc == 0) {
if (!m_command_byte.GetOptionValue().OptionWasSet()) {
Expand Down
16 changes: 8 additions & 8 deletions lldb/source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm.h
View file
Expand Up @@ -20,21 +20,21 @@ class RegisterContextKDP_arm : public RegisterContextDarwin_arm {
virtual ~RegisterContextKDP_arm();

protected:
virtual int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr);
int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override;

int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu);
int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override;

int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override;

int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg);
int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) override;

int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override;

int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override;

int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override;

int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg);
int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) override;

ThreadKDP &m_kdp_thread;
};
Expand Down
16 changes: 8 additions & 8 deletions lldb/source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_arm64.h
View file
Expand Up @@ -21,21 +21,21 @@ class RegisterContextKDP_arm64 : public RegisterContextDarwin_arm64 {
virtual ~RegisterContextKDP_arm64();

protected:
virtual int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr);
int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override;

int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu);
int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override;

int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override;

int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg);
int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) override;

int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override;

int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override;

int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override;

int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg);
int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) override;

ThreadKDP &m_kdp_thread;
};
Expand Down
12 changes: 6 additions & 6 deletions lldb/source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_i386.h
View file
Expand Up @@ -20,17 +20,17 @@ class RegisterContextKDP_i386 : public RegisterContextDarwin_i386 {
virtual ~RegisterContextKDP_i386();

protected:
virtual int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr);
int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override;

int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu);
int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override;

int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override;

int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override;

int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override;

int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override;

ThreadKDP &m_kdp_thread;
};
Expand Down
12 changes: 6 additions & 6 deletions lldb/source/Plugins/Process/MacOSX-Kernel/RegisterContextKDP_x86_64.h
View file
Expand Up @@ -20,17 +20,17 @@ class RegisterContextKDP_x86_64 : public RegisterContextDarwin_x86_64 {
virtual ~RegisterContextKDP_x86_64();

protected:
virtual int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr);
int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override;

int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu);
int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override;

int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override;

int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override;

int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override;

int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override;

ThreadKDP &m_kdp_thread;
};
Expand Down
16 changes: 8 additions & 8 deletions lldb/source/Plugins/Process/MacOSX-Kernel/ThreadKDP.h
View file
Expand Up @@ -22,16 +22,16 @@ class ThreadKDP : public lldb_private::Thread {

virtual ~ThreadKDP();

virtual void RefreshStateAfterStop();
void RefreshStateAfterStop() override;

virtual const char *GetName();
const char *GetName() override;

virtual const char *GetQueueName();
const char *GetQueueName() override;

virtual lldb::RegisterContextSP GetRegisterContext();
lldb::RegisterContextSP GetRegisterContext() override;

virtual lldb::RegisterContextSP
CreateRegisterContextForFrame(lldb_private::StackFrame *frame);
lldb::RegisterContextSP
CreateRegisterContextForFrame(lldb_private::StackFrame *frame) override;

void Dump(lldb_private::Log *log, uint32_t index);

Expand All @@ -41,7 +41,7 @@ class ThreadKDP : public lldb_private::Thread {

const char *GetBasicInfoAsString();

void SetName(const char *name) {
void SetName(const char *name) override {
if (name && name[0])
m_thread_name.assign(name);
else
Expand All @@ -66,7 +66,7 @@ class ThreadKDP : public lldb_private::Thread {
lldb::addr_t m_thread_dispatch_qaddr;
lldb::StopInfoSP m_cached_stop_info_sp;
// Protected member functions.
virtual bool CalculateStopInfo();
bool CalculateStopInfo() override;
};

#endif // LLDB_SOURCE_PLUGINS_PROCESS_MACOSX_KERNEL_THREADKDP_H
16 changes: 8 additions & 8 deletions lldb/source/Plugins/Process/Utility/RegisterContextMach_arm.h
View file
Expand Up @@ -19,21 +19,21 @@ class RegisterContextMach_arm : public RegisterContextDarwin_arm {
virtual ~RegisterContextMach_arm();

protected:
virtual int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr);
int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override;

int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu);
int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override;

int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override;

int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg);
int DoReadDBG(lldb::tid_t tid, int flavor, DBG &dbg) override;

int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override;

int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override;

int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override;

int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg);
int DoWriteDBG(lldb::tid_t tid, int flavor, const DBG &dbg) override;
};

#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERCONTEXTMACH_ARM_H
12 changes: 6 additions & 6 deletions lldb/source/Plugins/Process/Utility/RegisterContextMach_i386.h
View file
Expand Up @@ -19,17 +19,17 @@ class RegisterContextMach_i386 : public RegisterContextDarwin_i386 {
virtual ~RegisterContextMach_i386();

protected:
virtual int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr);
int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override;

int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu);
int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override;

int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override;

int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override;

int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override;

int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override;
};

#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERCONTEXTMACH_I386_H
12 changes: 6 additions & 6 deletions lldb/source/Plugins/Process/Utility/RegisterContextMach_x86_64.h
View file
Expand Up @@ -20,17 +20,17 @@ class RegisterContextMach_x86_64 : public RegisterContextDarwin_x86_64 {
virtual ~RegisterContextMach_x86_64();

protected:
virtual int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr);
int DoReadGPR(lldb::tid_t tid, int flavor, GPR &gpr) override;

int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu);
int DoReadFPU(lldb::tid_t tid, int flavor, FPU &fpu) override;

int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc);
int DoReadEXC(lldb::tid_t tid, int flavor, EXC &exc) override;

int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr);
int DoWriteGPR(lldb::tid_t tid, int flavor, const GPR &gpr) override;

int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu);
int DoWriteFPU(lldb::tid_t tid, int flavor, const FPU &fpu) override;

int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc);
int DoWriteEXC(lldb::tid_t tid, int flavor, const EXC &exc) override;
};

#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERCONTEXTMACH_X86_64_H
4 changes: 2 additions & 2 deletions lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h
View file
Expand Up @@ -33,9 +33,9 @@ class SymbolVendorMacOSX : public lldb_private::SymbolVendor {
virtual ~SymbolVendorMacOSX();

// PluginInterface protocol
virtual lldb_private::ConstString GetPluginName();
lldb_private::ConstString GetPluginName() override;

virtual uint32_t GetPluginVersion();
uint32_t GetPluginVersion() override;

private:
SymbolVendorMacOSX(const SymbolVendorMacOSX &) = delete;
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Symbol/FuncUnwinders.cpp
View file
Expand Up @@ -183,11 +183,11 @@ class RegisterContextToInfo: public SymbolFile::RegisterInfoResolver {
public:
RegisterContextToInfo(RegisterContext &ctx) : m_ctx(ctx) {}

const RegisterInfo *ResolveName(llvm::StringRef name) const {
const RegisterInfo *ResolveName(llvm::StringRef name) const override {
return m_ctx.GetRegisterInfoByName(name);
}
const RegisterInfo *ResolveNumber(lldb::RegisterKind kind,
uint32_t number) const {
uint32_t number) const override {
return m_ctx.GetRegisterInfo(kind, number);
}

Expand Down
70 changes: 35 additions & 35 deletions lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
View file
Expand Up @@ -31,38 +31,38 @@ class DNBArchImplI386 : public DNBArchProtocol {

static void Initialize();

virtual bool GetRegisterValue(uint32_t set, uint32_t reg,
DNBRegisterValue *value);
virtual bool SetRegisterValue(uint32_t set, uint32_t reg,
const DNBRegisterValue *value);
virtual nub_size_t GetRegisterContext(void *buf, nub_size_t buf_len);
virtual nub_size_t SetRegisterContext(const void *buf, nub_size_t buf_len);
virtual uint32_t SaveRegisterState();
virtual bool RestoreRegisterState(uint32_t save_id);

virtual kern_return_t GetRegisterState(int set, bool force);
virtual kern_return_t SetRegisterState(int set);
virtual bool RegisterSetStateIsValid(int set) const;

virtual uint64_t GetPC(uint64_t failValue); // Get program counter
virtual kern_return_t SetPC(uint64_t value);
virtual uint64_t GetSP(uint64_t failValue); // Get stack pointer
virtual void ThreadWillResume();
virtual bool ThreadDidStop();
virtual bool NotifyException(MachException::Data &exc);

virtual uint32_t NumSupportedHardwareBreakpoints();
virtual uint32_t NumSupportedHardwareWatchpoints();
virtual uint32_t EnableHardwareBreakpoint(nub_addr_t addr, nub_size_t size,
bool also_set_on_task);
virtual bool DisableHardwareBreakpoint(uint32_t hw_index,
bool also_set_on_task);
virtual uint32_t EnableHardwareWatchpoint(nub_addr_t addr, nub_size_t size,
bool read, bool write,
bool also_set_on_task);
virtual bool DisableHardwareWatchpoint(uint32_t hw_break_index,
bool also_set_on_task);
virtual uint32_t GetHardwareWatchpointHit(nub_addr_t &addr);
bool GetRegisterValue(uint32_t set, uint32_t reg,
DNBRegisterValue *value) override;
bool SetRegisterValue(uint32_t set, uint32_t reg,
const DNBRegisterValue *value) override;
nub_size_t GetRegisterContext(void *buf, nub_size_t buf_len) override;
nub_size_t SetRegisterContext(const void *buf, nub_size_t buf_len) override;
uint32_t SaveRegisterState() override;
bool RestoreRegisterState(uint32_t save_id) override;

kern_return_t GetRegisterState(int set, bool force) override;
kern_return_t SetRegisterState(int set) override;
bool RegisterSetStateIsValid(int set) const override;

uint64_t GetPC(uint64_t failValue) override; // Get program counter
kern_return_t SetPC(uint64_t value) override;
uint64_t GetSP(uint64_t failValue) override; // Get stack pointer
void ThreadWillResume() override;
bool ThreadDidStop() override;
bool NotifyException(MachException::Data &exc) override;

uint32_t NumSupportedHardwareBreakpoints() override;
uint32_t NumSupportedHardwareWatchpoints() override;
uint32_t EnableHardwareBreakpoint(nub_addr_t addr, nub_size_t size,
bool also_set_on_task) override;
bool DisableHardwareBreakpoint(uint32_t hw_index,
bool also_set_on_task) override;
uint32_t EnableHardwareWatchpoint(nub_addr_t addr, nub_size_t size,
bool read, bool write,
bool also_set_on_task) override;
bool DisableHardwareWatchpoint(uint32_t hw_break_index,
bool also_set_on_task) override;
uint32_t GetHardwareWatchpointHit(nub_addr_t &addr) override;

protected:
kern_return_t EnableHardwareSingleStep(bool enable);
Expand Down Expand Up @@ -228,9 +228,9 @@ class DNBArchImplI386 : public DNBArchProtocol {
static bool IsWatchpointHit(const DBG &debug_state, uint32_t hw_index);
static nub_addr_t GetWatchAddress(const DBG &debug_state, uint32_t hw_index);

virtual bool StartTransForHWP();
virtual bool RollbackTransForHWP();
virtual bool FinishTransForHWP();
bool StartTransForHWP() override;
bool RollbackTransForHWP() override;
bool FinishTransForHWP() override;
DBG GetDBGCheckpoint();

MachThread *m_thread;
Expand Down

0 comments on commit 44b43a5

Please sign in to comment.