From 9f9a683842ec3b9654a44751c94dbc2dbdf338b0 Mon Sep 17 00:00:00 2001 From: Erick Pfeifer Date: Mon, 30 Oct 2023 19:54:50 -0500 Subject: [PATCH 1/2] add_range: Replace THROW with WARN for early return Replaces THROW statement from the RangeSink::AddRange function, to WARN, when the translator CoversRange test fails. This will allow for the operation to resume, while ignoring those failing ranges, instead of throwing an exception. --- src/bloaty.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bloaty.cc b/src/bloaty.cc index 0a149ab..161ff1f 100644 --- a/src/bloaty.cc +++ b/src/bloaty.cc @@ -1334,7 +1334,8 @@ void RangeSink::AddRange(const char* analyzer, string_view name, if (translator_) { if (!translator_->vm_map.CoversRange(vmaddr, vmsize) || !translator_->file_map.CoversRange(fileoff, filesize)) { - THROW("Tried to add range that is not covered by base map."); + WARN("Tried to add range not covered by base map, range ignored."); + return; } } From ce7e84f316863ca8311b179f9dd5b36694a0b440 Mon Sep 17 00:00:00 2001 From: Erick Pfeifer Date: Wed, 1 Nov 2023 16:12:35 -0500 Subject: [PATCH 2/2] add_range: Modify early exit warning to add more info --- src/bloaty.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bloaty.cc b/src/bloaty.cc index 161ff1f..0f9881e 100644 --- a/src/bloaty.cc +++ b/src/bloaty.cc @@ -1334,7 +1334,9 @@ void RangeSink::AddRange(const char* analyzer, string_view name, if (translator_) { if (!translator_->vm_map.CoversRange(vmaddr, vmsize) || !translator_->file_map.CoversRange(fileoff, filesize)) { - WARN("Tried to add range not covered by base map, range ignored."); + WARN("AddRange($0, $1, $2, $3, $4) will be ignored, because it is not " + "covered by base map.", + name.data(), vmaddr, vmsize, fileoff, filesize); return; } }