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/Commands/CommandObjectSource.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/Commands/CommandObjectSource.cpp')
-rw-r--r-- | lldb/source/Commands/CommandObjectSource.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp index 98907c4..5ddd46a 100644 --- a/lldb/source/Commands/CommandObjectSource.cpp +++ b/lldb/source/Commands/CommandObjectSource.cpp @@ -50,20 +50,20 @@ class CommandObjectSourceInfo : public CommandObjectParsed { switch (short_option) { case 'l': if (option_arg.getAsInteger(0, start_line)) - error.SetErrorStringWithFormat("invalid line number: '%s'", - option_arg.str().c_str()); + error = Status::FromErrorStringWithFormat("invalid line number: '%s'", + option_arg.str().c_str()); break; case 'e': if (option_arg.getAsInteger(0, end_line)) - error.SetErrorStringWithFormat("invalid line number: '%s'", - option_arg.str().c_str()); + error = Status::FromErrorStringWithFormat("invalid line number: '%s'", + option_arg.str().c_str()); break; case 'c': if (option_arg.getAsInteger(0, num_lines)) - error.SetErrorStringWithFormat("invalid line count: '%s'", - option_arg.str().c_str()); + error = Status::FromErrorStringWithFormat("invalid line count: '%s'", + option_arg.str().c_str()); break; case 'f': @@ -612,14 +612,14 @@ class CommandObjectSourceList : public CommandObjectParsed { switch (short_option) { case 'l': if (option_arg.getAsInteger(0, start_line)) - error.SetErrorStringWithFormat("invalid line number: '%s'", - option_arg.str().c_str()); + error = Status::FromErrorStringWithFormat("invalid line number: '%s'", + option_arg.str().c_str()); break; case 'c': if (option_arg.getAsInteger(0, num_lines)) - error.SetErrorStringWithFormat("invalid line count: '%s'", - option_arg.str().c_str()); + error = Status::FromErrorStringWithFormat("invalid line count: '%s'", + option_arg.str().c_str()); break; case 'f': @@ -649,9 +649,8 @@ class CommandObjectSourceList : public CommandObjectParsed { OptionValueFileColonLine value; Status fcl_err = value.SetValueFromString(option_arg); if (!fcl_err.Success()) { - error.SetErrorStringWithFormat( - "Invalid value for file:line specifier: %s", - fcl_err.AsCString()); + error = Status::FromErrorStringWithFormat( + "Invalid value for file:line specifier: %s", fcl_err.AsCString()); } else { file_name = value.GetFileSpec().GetPath(); start_line = value.GetLineNumber(); |