lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

error.cc: Only suggest show-trace when truncated trace items would be printed

Browse source 
Otherwise, a trace consisting of

frame
frame
frame
non-frame

... would reach the non-frame and print the suggestion, even though
it would have ignored the non-frame anyway.

This resulted in a peculariar situation where --show-trace would have
no apparent effect, as the trace was actually already complete.
This commit is contained in:
Robert Hensing 2023-03-21 22:16:44 +01:00
parent 4dcc0a1b76
commit 233c4cf30f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libutil/error.cc
View file

@ -302,14 +302,14 @@ std::ostream & showErrorInfo(std::ostream & out, const ErrorInfo & einfo, bool s
if (!einfo.traces.empty()) { if (!einfo.traces.empty()) {
size_t count = 0; size_t count = 0;
for (const auto & trace : einfo.traces) { for (const auto & trace : einfo.traces) {
if (trace.hint.str().empty()) continue;
if (frameOnly && !trace.frame) continue;
if (!showTrace && count > 3) { if (!showTrace && count > 3) {
oss << "\n" << ANSI_WARNING "(stack trace truncated; use '--show-trace' to show the full trace)" ANSI_NORMAL << "\n"; oss << "\n" << ANSI_WARNING "(stack trace truncated; use '--show-trace' to show the full trace)" ANSI_NORMAL << "\n";
break; break;
} }
if (trace.hint.str().empty()) continue;
if (frameOnly && !trace.frame) continue;
count++; count++;
frameOnly = trace.frame; frameOnly = trace.frame;