Skip to content

[lldb] Include the version in the lldbassert error message #133740

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
Mar 31, 2025
Merged

[lldb] Include the version in the lldbassert error message #133740

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
1 change: 1 addition & 0 deletions lldb/source/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ add_lldb_library(lldbCore
lldbTarget
lldbUtility
lldbValueObject
lldbVersion
lldbPluginCPlusPlusLanguage
lldbPluginObjCLanguage
${LLDB_CURSES_LIBS}
Expand Down
5 changes: 3 additions & 2 deletions lldb/source/Core/Debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,8 +1525,9 @@ bool Debugger::FormatDisassemblerAddress(const FormatEntity::Entry *format,
void Debugger::AssertCallback(llvm::StringRef message,
llvm::StringRef backtrace,
llvm::StringRef prompt) {
Debugger::ReportError(
llvm::formatv("{0}\n{1}{2}", message, backtrace, prompt).str());
Debugger::ReportError(llvm::formatv("{0}\n{1}{2}\n{3}", message, backtrace,
GetVersion(), prompt)
.str());
}

void Debugger::SetLoggingCallback(lldb::LogOutputCallback log_callback,
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Utility/LLDBAssert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ void _lldb_assert(bool expression, const char *expr_text, const char *func,
expr_text, func, file, line)
.str(),
buffer,
"Please file a bug report against lldb reporting this failure log, and "
"as many details as possible");
"Please file a bug report against lldb and include the backtrace, the "
"version and as many details as possible.");
}

void SetLLDBAssertCallback(LLDBAssertCallback callback) {
Expand Down
Loading