Merge branch 'main' into dev

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 - [Changelog](#changelog)
+- [v0.6.0](#v060)
 - [v0.5.4](#v054)
 - [v0.5.3](#v053)
 - [v0.5.2](#v052)
@@ -15,6 +16,19 @@
 - [v0.1.1](#v011)
 - [v0.1](#v01)
 
+# v0.6.0
+
+New:
+- Added a `cpptrace::system_error` utility
+- Added support for musl https://github.com/jeremy-rifkin/cpptrace/issues/128
+- Added support for split dwarf / debug fission
+
+Fixes:
+- Fixed address formatting in stack traces
+- Fixed frame pointer calculation for signal frames from libunwind https://github.com/jeremy-rifkin/cpptrace/issues/123
+- Fixed dwarf_ranges handling of lowpc == pc causing erroneous symbol resolution
+- Fixed implementation of the exception helper system/reference implementation's `lazy_trace_holder`
+
 # v0.5.4
 
 Fixes:

CMakeLists.txt

@@ -9,7 +9,7 @@ set(package_name "cpptrace")
 
 project(
   cpptrace
-  VERSION 0.5.4
+  VERSION 0.6.0
   DESCRIPTION "Simple, portable, and self-contained stacktrace library for C++11 and newer "
   HOMEPAGE_URL "https://github.com/jeremy-rifkin/cpptrace"
   LANGUAGES C CXX
@@ -246,7 +246,7 @@ set(
   warning_options
   $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Werror=return-type -Wundef>
   $<$<CXX_COMPILER_ID:GNU>:-Wuseless-cast -Wmaybe-uninitialized>
-  $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX /permissive->
+  $<$<CXX_COMPILER_ID:MSVC>:/W4 /permissive->
 )
 
 if(CPPTRACE_WERROR_BUILD)

README.md

@@ -107,7 +107,7 @@ include(FetchContent)
 FetchContent_Declare(
   cpptrace
   GIT_REPOSITORY https://github.com/jeremy-rifkin/cpptrace.git
-  GIT_TAG        v0.5.4 # <HASH or TAG>
+  GIT_TAG        v0.6.0 # <HASH or TAG>
 )
 FetchContent_MakeAvailable(cpptrace)
 target_link_libraries(your_target cpptrace::cpptrace)
@@ -596,7 +596,7 @@ include(FetchContent)
 FetchContent_Declare(
   cpptrace
   GIT_REPOSITORY https://github.com/jeremy-rifkin/cpptrace.git
-  GIT_TAG        v0.5.4 # <HASH or TAG>
+  GIT_TAG        v0.6.0 # <HASH or TAG>
 )
 FetchContent_MakeAvailable(cpptrace)
 target_link_libraries(your_target cpptrace::cpptrace)
@@ -612,7 +612,7 @@ information.
 
 ```sh
 git clone https://github.com/jeremy-rifkin/cpptrace.git
-git checkout v0.5.4
+git checkout v0.6.0
 mkdir cpptrace/build
 cd cpptrace/build
 cmake .. -DCMAKE_BUILD_TYPE=Release
@@ -655,7 +655,7 @@ you when installing new libraries.
 
 ```ps1
 git clone https://github.com/jeremy-rifkin/cpptrace.git
-git checkout v0.5.4
+git checkout v0.6.0
 mkdir cpptrace/build
 cd cpptrace/build
 cmake .. -DCMAKE_BUILD_TYPE=Release
@@ -673,7 +673,7 @@ To install just for the local user (or any custom prefix):
 
 ```sh
 git clone https://github.com/jeremy-rifkin/cpptrace.git
-git checkout v0.5.4
+git checkout v0.6.0
 mkdir cpptrace/build
 cd cpptrace/build
 cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$HOME/wherever
@@ -756,7 +756,7 @@ make install
 cd ~/scratch/cpptrace-test
 git clone https://github.com/jeremy-rifkin/cpptrace.git
 cd cpptrace
-git checkout v0.5.4
+git checkout v0.6.0
 mkdir build
 cd build
 cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=On -DCPPTRACE_USE_EXTERNAL_LIBDWARF=On -DCMAKE_PREFIX_PATH=~/scratch/cpptrace-test/resources -DCMAKE_INSTALL_PREFIX=~/scratch/cpptrace-test/resources
@@ -776,7 +776,7 @@ cpptrace and its dependencies.
 Cpptrace is available through conan at https://conan.io/center/recipes/cpptrace.
 ```
 [requires]
-cpptrace/0.5.4
+cpptrace/0.6.0
 [generators]
 CMakeDeps
 CMakeToolchain

src/cpptrace.cpp

@@ -166,7 +166,7 @@ namespace cpptrace {
         if(frame.is_inline) {
             line += microfmt::format("{<{}}", 2 * sizeof(frame_ptr) + 2, "(inlined)");
         } else {
-            line += microfmt::format("{}0x{>{}:0h}{}", blue, 2 * sizeof(frame_ptr), frame.object_address, reset);
+            line += microfmt::format("{}0x{>{}:0h}{}", blue, 2 * sizeof(frame_ptr), frame.raw_address, reset);
         }
         if(!frame.symbol.empty()) {
             line += microfmt::format(" in {}{}{}", yellow, frame.symbol, reset);