From 12286a2739fa9c028ff9726246a47f92f9f8be1e Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Sat, 8 Sep 2018 10:33:14 +0000 Subject: Revert "Modernize NativeProcessProtocol::GetSoftwareBreakpointTrapOpcode" This reverts commit r341487. Jan Kratochvil reports it breaks LLDB when compiling with clang. llvm-svn: 341747 --- lldb/source/Plugins/Process/Linux/NativeProcessLinux.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.h') diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h index 97ad5711ff11..1c2f786e8d69 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.h @@ -134,8 +134,13 @@ public: bool SupportHardwareSingleStepping() const; protected: - llvm::Expected> - GetSoftwareBreakpointTrapOpcode(size_t size_hint) override; + // --------------------------------------------------------------------- + // NativeProcessProtocol protected interface + // --------------------------------------------------------------------- + Status + GetSoftwareBreakpointTrapOpcode(size_t trap_opcode_size_hint, + size_t &actual_opcode_size, + const uint8_t *&trap_opcode_bytes) override; private: MainLoop::SignalHandleUP m_sigchld_handle; -- cgit v1.2.3