[FarGroup/FarManager] master: Extend 6616 to GCC (e9d7885ae)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/e9d7885ae9d2f167aece8c4274612bf525717b52

>---------------------------------------------------------------

commit e9d7885ae9d2f167aece8c4274612bf525717b52
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Mon Dec 29 17:43:26 2025 +0000

Extend 6616 to GCC


>---------------------------------------------------------------

e9d7885ae9d2f167aece8c4274612bf525717b52
far/exception_handler.cpp | 24 ++++++++++++++++++------
far/exception_handler_test.cpp | 4 ++--
2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/far/exception_handler.cpp b/far/exception_handler.cpp
index befb8118e..2decb0c4c 100644
--- a/far/exception_handler.cpp
+++ b/far/exception_handler.cpp
@@ -1326,11 +1326,11 @@ private:
uintptr_t m_ThrownObjectPtr{};
};

-static auto extract_object_value(string_view const TypeName, void const* Data, size_t const DataSize)
+static auto extract_object_value(string_view const TypeName, void const* Data, std::optional<size_t> const DataSize)
{
static_assert(sizeof(int) == sizeof(long));

- if (DataSize == sizeof(unsigned int) && (
+ if ((!DataSize || *DataSize == sizeof(unsigned int)) && (
TypeName == L"int"sv ||
TypeName == L"unsigned int"sv ||
TypeName == L"long"sv ||
@@ -1341,19 +1341,29 @@ static auto extract_object_value(string_view const TypeName, void const* Data, s
return os::format_error(Value);
}

- if (TypeName == L"char * __ptr64"sv || TypeName == L"char *"sv)
+ if (
+ TypeName == L"char * __ptr64"sv || // MSVC 64
+ TypeName == L"char *"sv || // MSVC 32
+ TypeName == L"char const*"sv // GCC
+ )
{
const auto Value = *static_cast<char const* const*>(Data);
return encoding::utf8_or_ansi::get_chars(Value);
}

- if (TypeName == L"wchar_t * __ptr64"sv || TypeName == L"wchar_t *"sv)
+ if (
+ TypeName == L"wchar_t * __ptr64"sv || // MSVC 64
+ TypeName == L"wchar_t *"sv || // MSVC 32
+ TypeName == L"wchar_t const*"sv // GCC
+ )
{
const auto Value = *static_cast<wchar_t const* const*>(Data);
return string(Value);
}

- return far::format(L"[{} bytes]"sv, DataSize);
+ return DataSize?
+ far::format(L"[{} bytes]"sv, *DataSize) :
+ L""s;
}

static std::pair<string, string> extract_object_type_and_value(EXCEPTION_RECORD const& xr)
@@ -1369,8 +1379,10 @@ static std::pair<string, string> extract_object_type_and_value(EXCEPTION_RECORD
#if !IS_MICROSOFT_SDK()
if (const auto TypeInfo = abi::__cxa_current_exception_type(); TypeInfo)
{
+ const auto ExceptionPtr = std::current_exception();
+ const auto Data = *std::bit_cast<void const* const*>(&ExceptionPtr);
const auto TypeName = os::debug::demangle(TypeInfo->name());
- return { TypeName, {} };
+ return { TypeName, extract_object_value(TypeName, Data, {}) };
}
#endif

diff --git a/far/exception_handler_test.cpp b/far/exception_handler_test.cpp
index 17f4492cd..cdcddeba4 100644
--- a/far/exception_handler_test.cpp
+++ b/far/exception_handler_test.cpp
@@ -184,13 +184,13 @@ namespace tests
[[noreturn]]
static void cpp_unknown_char()
{
- throw "error";
+ throw "oops";
}

[[noreturn]]
static void cpp_unknown_wchar_t()
{
- throw L"error";
+ throw L"oops";
}

[[noreturn]]