Skip to content

[Cherry-pick into swift/release/6.1] [lldb] Fix a regression in Status::GetErrorType() (#117095) #9659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2024
Merged

[Cherry-pick into swift/release/6.1] [lldb] Fix a regression in Status::GetErrorType() (#117095) #9659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lldb/source/Utility/Status.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,11 @@ ErrorType Status::GetType() const {
// Return the first only.
if (result != eErrorTypeInvalid)
return;
result = ErrorCodeToErrorType(error.convertToErrorCode());
if (error.isA<CloneableError>())
result = static_cast<const CloneableError &>(error).GetErrorType();
else
result = ErrorCodeToErrorType(error.convertToErrorCode());

});
return result;
}
Expand Down
12 changes: 12 additions & 0 deletions lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,18 @@ def test_source_locations_from_objc_modules(self):
# the first argument are probably stable enough that this test can check for them.
self.assertIn("void NSLog(NSString *format", value.GetError().GetCString())

def test_error_type(self):
"""Test the error reporting in the API"""
self.build()

(target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
self, "// Break here", self.main_source_spec
)
frame = thread.GetFrameAtIndex(0)
value = frame.EvaluateExpression('#error("I am error.")')
error = value.GetError()
self.assertEqual(error.GetType(), lldb.eErrorTypeExpression)

def test_command_expr_sbdata(self):
"""Test the structured diagnostics data"""
self.build()
Expand Down