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/NativeRegisterContextLinux_arm.cpp | |
parent | e25e6da9173b473bd7075dd8afb816dfd2bd90d8 (diff) | |
download | bcm5719-llvm-665be50e37b370f17e0dcaad79f7bd64af4614cc.tar.gz bcm5719-llvm-665be50e37b370f17e0dcaad79f7bd64af4614cc.zip |
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/NativeRegisterContextLinux_arm.cpp')
-rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp index 45664937676..9e857139cfc 100644 --- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm.cpp @@ -263,7 +263,7 @@ Error NativeRegisterContextLinux_arm::WriteRegister( if (error.Fail()) return error; - return Error::success(); + return Error(); } return Error("failed - register wasn't recognized to be a GPR or an FPR, " @@ -679,7 +679,7 @@ Error NativeRegisterContextLinux_arm::ClearAllHardwareWatchpoints() { } } - return Error::success(); + return Error(); } uint32_t NativeRegisterContextLinux_arm::GetWatchpointSize(uint32_t wp_index) { @@ -730,12 +730,12 @@ Error NativeRegisterContextLinux_arm::GetWatchpointHitIndex( if (WatchpointIsEnabled(wp_index) && trap_addr >= watch_addr && trap_addr < watch_addr + watch_size) { m_hwp_regs[wp_index].hit_addr = trap_addr; - return Error::success(); + return Error(); } } wp_index = LLDB_INVALID_INDEX32; - return Error::success(); + return Error(); } lldb::addr_t @@ -774,7 +774,7 @@ Error NativeRegisterContextLinux_arm::ReadHardwareDebugInfo() { Error error; if (!m_refresh_hwdebug_info) { - return Error::success(); + return Error(); } unsigned int cap_val; @@ -862,7 +862,7 @@ Error NativeRegisterContextLinux_arm::DoReadRegisterValue( return error; value.SetUInt32(m_gpr_arm[offset / sizeof(uint32_t)]); - return Error::success(); + return Error(); } Error NativeRegisterContextLinux_arm::DoWriteRegisterValue( |