diff options
| author | Pavel Labath <pavel@labath.sk> | 2018-09-08 10:33:14 +0000 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2018-09-08 10:33:14 +0000 |
| commit | 12286a2739fa9c028ff9726246a47f92f9f8be1e (patch) | |
| tree | 80044e38f9de8b91a94f81327fd4235616eb6adc /lldb/source/Plugins/Process/Linux/NativeProcessLinux.h | |
| parent | 85dacd1116feee2246c4c0ca82ce037bf7d70401 (diff) | |
| download | llvm-12286a2739fa9c028ff9726246a47f92f9f8be1e.tar.gz llvm-12286a2739fa9c028ff9726246a47f92f9f8be1e.tar.bz2 llvm-12286a2739fa9c028ff9726246a47f92f9f8be1e.zip | |
Revert "Modernize NativeProcessProtocol::GetSoftwareBreakpointTrapOpcode"
This reverts commit r341487. Jan Kratochvil reports it breaks LLDB when
compiling with clang.
llvm-svn: 341747
Diffstat (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.h')
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeProcessLinux.h | 9 |
1 files changed, 7 insertions, 2 deletions
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<llvm::ArrayRef<uint8_t>> - 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; |