diff options
author | Adrian Prantl <aprantl@apple.com> | 2024-08-27 10:59:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-27 10:59:31 -0700 |
commit | 0642cd768b80665585c8500bed2933a3b99123dc (patch) | |
tree | a412a5eafff54ef9a7cb884e01907a4f521f5140 /lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp | |
parent | acb33a0c9bc902dc1aef703c02b8fd3a1132cb14 (diff) | |
download | llvm-0642cd768b80665585c8500bed2933a3b99123dc.zip llvm-0642cd768b80665585c8500bed2933a3b99123dc.tar.gz llvm-0642cd768b80665585c8500bed2933a3b99123dc.tar.bz2 |
[lldb] Turn lldb_private::Status into a value type. (#106163)
This patch removes all of the Set.* methods from Status.
This cleanup is part of a series of patches that make it harder use the
anti-pattern of keeping a long-lives Status object around and updating
it while dropping any errors it contains on the floor.
This patch is largely NFC, the more interesting next steps this enables
is to:
1. remove Status.Clear()
2. assert that Status::operator=() never overwrites an error
3. remove Status::operator=()
Note that step (2) will bring 90% of the benefits for users, and step
(3) will dramatically clean up the error handling code in various
places. In the end my goal is to convert all APIs that are of the form
` ResultTy DoFoo(Status& error)
`
to
` llvm::Expected<ResultTy> DoFoo()
`
How to read this patch?
The interesting changes are in Status.h and Status.cpp, all other
changes are mostly
` perl -pi -e 's/\.SetErrorString/ = Status::FromErrorString/g' $(git
grep -l SetErrorString lldb/source)
`
plus the occasional manual cleanup.
Diffstat (limited to 'lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp')
-rw-r--r-- | lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index f348b94b..10d0966 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -1068,7 +1068,8 @@ ObjectFileELF::RefineModuleDetailsFromNote(lldb_private::DataExtractor &data, // Pull out the min version info. uint32_t version_info; if (data.GetU32(&offset, &version_info, 1) == nullptr) { - error.SetErrorString("failed to read FreeBSD ABI note payload"); + error = + Status::FromErrorString("failed to read FreeBSD ABI note payload"); return error; } @@ -1099,7 +1100,8 @@ ObjectFileELF::RefineModuleDetailsFromNote(lldb_private::DataExtractor &data, uint32_t version_info[4]; if (data.GetU32(&offset, &version_info[0], note.n_descsz / 4) == nullptr) { - error.SetErrorString("failed to read GNU ABI note payload"); + error = + Status::FromErrorString("failed to read GNU ABI note payload"); return error; } @@ -1160,7 +1162,8 @@ ObjectFileELF::RefineModuleDetailsFromNote(lldb_private::DataExtractor &data, // Save the build id as the UUID for the module. uuid = UUID(buf, note.n_descsz); } else { - error.SetErrorString("failed to read GNU_BUILD_ID note payload"); + error = Status::FromErrorString( + "failed to read GNU_BUILD_ID note payload"); return error; } } @@ -1180,7 +1183,8 @@ ObjectFileELF::RefineModuleDetailsFromNote(lldb_private::DataExtractor &data, // Pull out the version info. uint32_t version_info; if (data.GetU32(&offset, &version_info, 1) == nullptr) { - error.SetErrorString("failed to read NetBSD ABI note payload"); + error = + Status::FromErrorString("failed to read NetBSD ABI note payload"); return error; } // Convert the version info into a major/minor/patch number. @@ -1251,10 +1255,11 @@ ObjectFileELF::RefineModuleDetailsFromNote(lldb_private::DataExtractor &data, for (size_t i = 0; i < count; ++i) { cstr = data.GetCStr(&offset); if (cstr == nullptr) { - error.SetErrorStringWithFormat("ObjectFileELF::%s trying to read " - "at an offset after the end " - "(GetCStr returned nullptr)", - __FUNCTION__); + error = Status::FromErrorStringWithFormat( + "ObjectFileELF::%s trying to read " + "at an offset after the end " + "(GetCStr returned nullptr)", + __FUNCTION__); return error; } llvm::StringRef path(cstr); |