diff options
author | Mehdi Amini <mehdi.amini@apple.com> | 2016-11-11 05:07:57 +0000 |
---|---|---|
committer | Mehdi Amini <mehdi.amini@apple.com> | 2016-11-11 05:07:57 +0000 |
commit | 665be50e37b370f17e0dcaad79f7bd64af4614cc (patch) | |
tree | 403fe8c10a9c5fa114132390237f6d118ba56435 /lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp | |
parent | e25e6da9173b473bd7075dd8afb816dfd2bd90d8 (diff) | |
download | llvm-665be50e37b370f17e0dcaad79f7bd64af4614cc.zip llvm-665be50e37b370f17e0dcaad79f7bd64af4614cc.tar.gz llvm-665be50e37b370f17e0dcaad79f7bd64af4614cc.tar.bz2 |
Revert unwanted changes in lldb when updating llvm::Error()
My script updated lldb::Errors, and I failed to fix it entirely
before pushing. This restore everything in lldb as it was before
r286561.
llvm-svn: 286565
Diffstat (limited to 'lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp')
-rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp index 6b4426b..d18d3c1 100644 --- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp @@ -167,7 +167,7 @@ Error NativeThreadLinux::SetWatchpoint(lldb::addr_t addr, size_t size, if (!hardware) return Error("not implemented"); if (m_state == eStateLaunching) - return Error::success(); + return Error(); Error error = RemoveWatchpoint(addr); if (error.Fail()) return error; @@ -176,17 +176,17 @@ Error NativeThreadLinux::SetWatchpoint(lldb::addr_t addr, size_t size, if (wp_index == LLDB_INVALID_INDEX32) return Error("Setting hardware watchpoint failed."); m_watchpoint_index_map.insert({addr, wp_index}); - return Error::success(); + return Error(); } Error NativeThreadLinux::RemoveWatchpoint(lldb::addr_t addr) { auto wp = m_watchpoint_index_map.find(addr); if (wp == m_watchpoint_index_map.end()) - return Error::success(); + return Error(); uint32_t wp_index = wp->second; m_watchpoint_index_map.erase(wp); if (GetRegisterContext()->ClearHardwareWatchpoint(wp_index)) - return Error::success(); + return Error(); return Error("Clearing hardware watchpoint failed."); } |