https://github.com/igorkudrin updated
https://github.com/llvm/llvm-project/pull/139197
>From 3faf0c0a4a19d7e1d503c31a684d79295e414be4 Mon Sep 17 00:00:00 2001
From: Igor Kudrin <ikud...@accesssoftek.com>
Date: Thu, 8 May 2025 18:37:34 -0700
Subject: [PATCH 1/2] [lldb][NFC] Avoid an assertion failure in dwim-print
In a Debug build on Windows, printing inline diagnostics resulted in an
error, for example:
```
> cd llvm-project\lldb\test\API\functionalities\postmortem\elf-core
> lldb.exe -c altmain.core
> p dummy
LLDB diagnostics will be written to ...
Please include the directory content when filing a bug report
Exception Code: 0x80000003
0x00007FF8FD6633EC, C:\llvm\build\bin\liblldb.dll(0x00007FF8FC2C0000) +
0x13A33EC byte(s),
std::_Vector_const_iterator<std::_Vector_val<std::_Simple_types<lldb_private::DiagnosticDetail>
> >::_Compat() + 0x6C byte(s), C:\Program Files\Microsoft Visual
Studio\2022\Professional\VC\Tools\MSVC\14.43.34808\include\vector, line 202 +
0x5D byte(s)
0x00007FF8FD662ABE, C:\llvm\build\bin\liblldb.dll(0x00007FF8FC2C0000) +
0x13A2ABE byte(s),
std::_Vector_const_iterator<std::_Vector_val<std::_Simple_types<lldb_private::DiagnosticDetail>
> >::operator==() + 0x1E byte(s), C:\Program Files\Microsoft Visual
Studio\2022\Professional\VC\Tools\MSVC\14.43.34808\include\vector, line 166 +
0x0 byte(s)
0x00007FF8FD662B2E, C:\llvm\build\\bin\liblldb.dll(0x00007FF8FC2C0000) +
0x13A2B2E byte(s),
std::_Vector_const_iterator<std::_Vector_val<std::_Simple_types<lldb_private::DiagnosticDetail>
> >::operator!=() + 0x1E byte(s), C:\Program Files\Microsoft Visual
Studio\2022\Professional\VC\Tools\MSVC\14.43.34808\include\vector, line 176 +
0xF byte(s)
0x00007FF8FD65EE1C, C:\llvm\build\\bin\liblldb.dll(0x00007FF8FC2C0000) +
0x139EE1C byte(s),
std::operator!=<std::_Vector_iterator<std::_Vector_val<std::_Simple_types<lldb_private::DiagnosticDetail>
>
>,std::_Vector_iterator<std::_Vector_val<std::_Simple_types<lldb_private::DiagnosticDetail>
> > >() + 0x3C byte(s), C:\Program Files\Microsoft Visual
Studio\2022\Professional\VC\Tools\MSVC\14.43.34808\include\xutility, line 1947
+ 0x0 byte(s)
0x00007FF8FD65D4E5, C:\llvm\build\\bin\liblldb.dll(0x00007FF8FC2C0000) +
0x139D4E5 byte(s), lldb_private::RenderDiagnosticDetails() + 0x8F5 byte(s),
C:\llvm\src\llvm-project\lldb\source\Utility\DiagnosticsRendering.cpp, line 189
+ 0x25 byte(s)
...
```
The comparison operator of the iterators checks that they belong to the
same container, but `remaining_details.pop_back()` invalidates `detail`
making it incompatible with `remaining_details.rend()`.
---
lldb/source/Utility/DiagnosticsRendering.cpp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lldb/source/Utility/DiagnosticsRendering.cpp
b/lldb/source/Utility/DiagnosticsRendering.cpp
index 368e2199b749f..c43b39b6b8fe9 100644
--- a/lldb/source/Utility/DiagnosticsRendering.cpp
+++ b/lldb/source/Utility/DiagnosticsRendering.cpp
@@ -185,9 +185,8 @@ void RenderDiagnosticDetails(Stream &stream,
// Work through each detail in reverse order using the vector/stack.
bool did_print = false;
- for (auto detail = remaining_details.rbegin();
- detail != remaining_details.rend();
- ++detail, remaining_details.pop_back()) {
+ for (; !remaining_details.empty(); remaining_details.pop_back()) {
+ auto &detail = remaining_details.back();
// Get the information to print this detail and remove it from the stack.
// Print all the lines for all the other messages first.
stream << std::string(padding, ' ');
@@ -196,7 +195,7 @@ void RenderDiagnosticDetails(Stream &stream,
llvm::ArrayRef(remaining_details).drop_back(1)) {
uint16_t column = remaining_detail.source_location->column;
// Is this a note with the same column as another diagnostic?
- if (column == detail->source_location->column)
+ if (column == detail.source_location->column)
continue;
if (column >= x_pos) {
@@ -205,16 +204,16 @@ void RenderDiagnosticDetails(Stream &stream,
}
}
- uint16_t column = detail->source_location->column;
+ uint16_t column = detail.source_location->column;
// Print the line connecting the ^ with the error message.
if (column >= x_pos)
stream << std::string(column - x_pos, ' ') << joint << hbar << spacer;
// Print a colorized string based on the message's severity type.
- PrintSeverity(stream, detail->severity);
+ PrintSeverity(stream, detail.severity);
// Finally, print the message and start a new line.
- stream << detail->message << '\n';
+ stream << detail.message << '\n';
did_print = true;
}
>From 169c3401717ccff0d28c18318a9b433165076d4b Mon Sep 17 00:00:00 2001
From: Igor Kudrin <igor.kud...@gmail.com>
Date: Fri, 9 May 2025 13:36:20 -0700
Subject: [PATCH 2/2] Update lldb/source/Utility/DiagnosticsRendering.cpp
Co-authored-by: Michael Buch <michaelbuc...@gmail.com>
---
lldb/source/Utility/DiagnosticsRendering.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lldb/source/Utility/DiagnosticsRendering.cpp
b/lldb/source/Utility/DiagnosticsRendering.cpp
index c43b39b6b8fe9..e73d688bb4be5 100644
--- a/lldb/source/Utility/DiagnosticsRendering.cpp
+++ b/lldb/source/Utility/DiagnosticsRendering.cpp
@@ -186,7 +186,7 @@ void RenderDiagnosticDetails(Stream &stream,
// Work through each detail in reverse order using the vector/stack.
bool did_print = false;
for (; !remaining_details.empty(); remaining_details.pop_back()) {
- auto &detail = remaining_details.back();
+ const auto &detail = remaining_details.back();
// Get the information to print this detail and remove it from the stack.
// Print all the lines for all the other messages first.
stream << std::string(padding, ' ');
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
