diff options
author | Adrian Prantl <aprantl@apple.com> | 2024-09-05 12:19:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-05 12:19:31 -0700 |
commit | a0dd90eb7dc318c9b3fccb9ba02e1e22fb073094 (patch) | |
tree | f03fbc20be24f82712bceb984e1a2a0afe528bf9 /lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | |
parent | 5e1e6a689c82aaf2b7af72e074c95889a11d3a78 (diff) | |
download | llvm-a0dd90eb7dc318c9b3fccb9ba02e1e22fb073094.zip llvm-a0dd90eb7dc318c9b3fccb9ba02e1e22fb073094.tar.gz llvm-a0dd90eb7dc318c9b3fccb9ba02e1e22fb073094.tar.bz2 |
[lldb] Make conversions from llvm::Error explicit with Status::FromEr… (#107163)
…ror() [NFC]
Diffstat (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp')
-rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 1e2e3a8..cc0e34e 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -1287,7 +1287,7 @@ Status NativeProcessLinux::PopulateMemoryRegionCache() { return true; } - Result = Info.takeError(); + Result = Status::FromError(Info.takeError()); m_supports_mem_region = LazyBool::eLazyBoolNo; LLDB_LOG(log, "failed to parse proc maps: {0}", Result); return false; @@ -1475,7 +1475,7 @@ Status NativeProcessLinux::ReadMemoryTags(int32_t type, lldb::addr_t addr, llvm::Expected<NativeRegisterContextLinux::MemoryTaggingDetails> details = GetCurrentThread()->GetRegisterContext().GetMemoryTaggingDetails(type); if (!details) - return Status(details.takeError()); + return Status::FromError(details.takeError()); // Ignore 0 length read if (!len) @@ -1530,7 +1530,7 @@ Status NativeProcessLinux::WriteMemoryTags(int32_t type, lldb::addr_t addr, llvm::Expected<NativeRegisterContextLinux::MemoryTaggingDetails> details = GetCurrentThread()->GetRegisterContext().GetMemoryTaggingDetails(type); if (!details) - return Status(details.takeError()); + return Status::FromError(details.takeError()); // Ignore 0 length write if (!len) @@ -1547,18 +1547,18 @@ Status NativeProcessLinux::WriteMemoryTags(int32_t type, lldb::addr_t addr, llvm::Expected<std::vector<lldb::addr_t>> unpacked_tags_or_err = details->manager->UnpackTagsData(tags); if (!unpacked_tags_or_err) - return Status(unpacked_tags_or_err.takeError()); + return Status::FromError(unpacked_tags_or_err.takeError()); llvm::Expected<std::vector<lldb::addr_t>> repeated_tags_or_err = details->manager->RepeatTagsForRange(*unpacked_tags_or_err, range); if (!repeated_tags_or_err) - return Status(repeated_tags_or_err.takeError()); + return Status::FromError(repeated_tags_or_err.takeError()); // Repack them for ptrace to use llvm::Expected<std::vector<uint8_t>> final_tag_data = details->manager->PackTags(*repeated_tags_or_err); if (!final_tag_data) - return Status(final_tag_data.takeError()); + return Status::FromError(final_tag_data.takeError()); struct iovec tags_vec; uint8_t *src = final_tag_data->data(); @@ -1790,7 +1790,7 @@ void NativeProcessLinux::NotifyTracersProcessWillResume() { Status NativeProcessLinux::NotifyTracersOfNewThread(lldb::tid_t tid) { Log *log = GetLog(POSIXLog::Thread); - Status error(m_intel_pt_collector.OnThreadCreated(tid)); + Status error = Status::FromError(m_intel_pt_collector.OnThreadCreated(tid)); if (error.Fail()) LLDB_LOG(log, "Failed to trace a new thread with intel-pt, tid = {0}. {1}", tid, error.AsCString()); @@ -1799,7 +1799,7 @@ Status NativeProcessLinux::NotifyTracersOfNewThread(lldb::tid_t tid) { Status NativeProcessLinux::NotifyTracersOfThreadDestroyed(lldb::tid_t tid) { Log *log = GetLog(POSIXLog::Thread); - Status error(m_intel_pt_collector.OnThreadDestroyed(tid)); + Status error = Status::FromError(m_intel_pt_collector.OnThreadDestroyed(tid)); if (error.Fail()) LLDB_LOG(log, "Failed to stop a destroyed thread with intel-pt, tid = {0}. {1}", |