Merge pull request #1 from jeremy-rifkin/main

Bump to v0.8.3 from master

Author: ppizarror

.gitignore

@@ -9,3 +9,5 @@ scratch
 tmp/
 bazel-*/
 cmake-build-*/
+
+test/jank/data

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 - [Changelog](#changelog)
+- [v0.8.3](#v083)
 - [v0.8.2](#v082)
 - [v0.8.1](#v081)
 - [v0.8.0](#v080)
@@ -28,6 +29,25 @@
 - [v0.1.1](#v011)
 - [v0.1](#v01)
 
+# v0.8.3
+
+Added:
+- Added basic JIT support https://github.com/jeremy-rifkin/cpptrace/issues/226
+- Added `cpptrace::formatter::transform` https://github.com/jeremy-rifkin/cpptrace/issues/227
+- Added support for gcc 4.8.5 https://github.com/jeremy-rifkin/cpptrace/issues/220
+
+Fixed:
+- Fixed bug related to calling `dwarf_dealloc` on strings from `dwarf_formstring` and `dwarf_diename` https://github.com/davea42/libdwarf-code/issues/279
+- Fixed incorrect cmake version variable https://github.com/jeremy-rifkin/cpptrace/issues/231
+- Fixed `address_mode::none` not working https://github.com/jeremy-rifkin/cpptrace/issues/221
+- Fixed use of `-Wall` for clang-cl
+
+Other:
+- Added ARM CI
+- Miscellaneous work on supporting old compilers
+- Updated cpptrace cmake target configuration to not add public compile definitions
+- Internal refactoring, cleanup, and code improvements
+
 # v0.8.2
 
 Fixed:

CMakeLists.txt

@@ -9,7 +9,7 @@ set(package_name "cpptrace")
 
 project(
   cpptrace
-  VERSION 0.8.2
+  VERSION 0.8.3
   DESCRIPTION "Simple, portable, and self-contained stacktrace library for C++11 and newer "
   HOMEPAGE_URL "https://github.com/jeremy-rifkin/cpptrace"
   LANGUAGES C CXX
@@ -34,12 +34,20 @@ endif()
 if(PROJECT_IS_TOP_LEVEL)
   if(CMAKE_GENERATOR STREQUAL "Ninja")
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
+      include(CheckCXXCompilerFlag)
+      check_cxx_compiler_flag(-fdiagnostics-color=always HAS_CXX_FDIAGNOSTICS_COLOR)
+      if(HAS_CXX_FDIAGNOSTICS_COLOR)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
+      endif()
     elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
     endif()
     if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
+      include(CheckCCompilerFlag)
+      check_c_compiler_flag(-fdiagnostics-color=always HAS_C_FDIAGNOSTICS_COLOR)
+      if(HAS_C_FDIAGNOSTICS_COLOR)
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
+      endif()
     elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics")
     endif()
@@ -119,6 +127,7 @@ target_sources(
     src/demangle/demangle_with_cxxabi.cpp
     src/demangle/demangle_with_nothing.cpp
     src/demangle/demangle_with_winapi.cpp
+    src/jit/jit_objects.cpp
     src/snippets/snippet.cpp
     src/symbols/dwarf/debug_map_resolver.cpp
     src/symbols/dwarf/dwarf_options.cpp
@@ -136,7 +145,11 @@ target_sources(
     src/unwind/unwind_with_nothing.cpp
     src/unwind/unwind_with_unwind.cpp
     src/unwind/unwind_with_winapi.cpp
+    src/utils/io/file.cpp
+    src/utils/io/memory_file_view.cpp
+    src/utils/error.cpp
     src/utils/microfmt.cpp
+    src/utils/string_view.cpp
     src/utils/utils.cpp
     src/platform/dbghelp_utils.cpp
 )
@@ -154,9 +167,15 @@ target_include_directories(
   src
 )
 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND "${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
+  set(IS_CLANG_CL 1)
+else()
+  set(IS_CLANG_CL 0)
+endif()
+
 set(
   warning_options
-  $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Werror=return-type -Wundef>
+  $<$<NOT:$<OR:$<CXX_COMPILER_ID:MSVC>,$<STREQUAL:${IS_CLANG_CL},1>>>:-Wall -Wextra -Werror=return-type -Wundef>
   $<$<CXX_COMPILER_ID:GNU>:-Wuseless-cast -Wmaybe-uninitialized>
   $<$<CXX_COMPILER_ID:MSVC>:/W4 /permissive->
 )
@@ -176,6 +195,11 @@ target_compile_options(
   ${warning_options}
 )
 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+  # https://godbolt.org/z/qYh89E6rq
+  target_compile_options(${target_name} PRIVATE -Wno-missing-field-initializers)
+endif()
+
 set(CPPTRACE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 set(CPPTRACE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 set(CPPTRACE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
@@ -243,19 +267,19 @@ endif()
 # =================================================== Back-end setup ===================================================
 
 if(HAS_CXX_EXCEPTION_TYPE)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_HAS_CXX_EXCEPTION_TYPE)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_HAS_CXX_EXCEPTION_TYPE)
 endif()
 
 if(HAS_DL_FIND_OBJECT)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_HAS_DL_FIND_OBJECT)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_HAS_DL_FIND_OBJECT)
 endif()
 
 if(HAS_DLADDR1)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_HAS_DLADDR1)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_HAS_DLADDR1)
 endif()
 
 if(HAS_MACH_VM)
-  target_compile_definitions(${target_name} PUBLIC HAS_MACH_VM)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_HAS_MACH_VM)
 endif()
 
 # Symbols
@@ -267,20 +291,20 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBBACKTRACE)
       message(WARNING "Cpptrace: Using libbacktrace for symbols but libbacktrace doesn't appear installed or configured properly. You may need to specify CPPTRACE_BACKTRACE_PATH.")
     endif()
   endif()
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBBACKTRACE)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_GET_SYMBOLS_WITH_LIBBACKTRACE)
   target_link_libraries(${target_name} PRIVATE backtrace ${CMAKE_DL_LIBS})
 endif()
 
 if(CPPTRACE_GET_SYMBOLS_WITH_LIBDL)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDL)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_GET_SYMBOLS_WITH_LIBDL)
   target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS})
 endif()
 
 if(CPPTRACE_GET_SYMBOLS_WITH_ADDR2LINE)
   # set(CPPTRACE_ADDR2LINE_PATH "" CACHE STRING "Absolute path to the addr2line executable you want to use.")
   # option(CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH "" OFF)
   if(CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH)
-    target_compile_definitions(${target_name} PUBLIC CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH)
+    target_compile_definitions(${target_name} PRIVATE CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH)
   else()
     if("${CPPTRACE_ADDR2LINE_PATH}" STREQUAL "")
       if(APPLE)
@@ -292,16 +316,16 @@ if(CPPTRACE_GET_SYMBOLS_WITH_ADDR2LINE)
       set(CPPTRACE_ADDR2LINE_PATH_FINAL "${CPPTRACE_ADDR2LINE_PATH}")
     endif()
     message(STATUS "Cpptrace: Using ${CPPTRACE_ADDR2LINE_PATH_FINAL} for addr2line path")
-    target_compile_definitions(${target_name} PUBLIC CPPTRACE_ADDR2LINE_PATH="${CPPTRACE_ADDR2LINE_PATH_FINAL}")
+    target_compile_definitions(${target_name} PRIVATE CPPTRACE_ADDR2LINE_PATH="${CPPTRACE_ADDR2LINE_PATH_FINAL}")
   endif()
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_ADDR2LINE)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_GET_SYMBOLS_WITH_ADDR2LINE)
   if(UNIX)
     target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS})
   endif()
 endif()
 
 if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
   if(CPPTRACE_USE_EXTERNAL_LIBDWARF)
     if(NOT CPPTRACE_FIND_LIBDWARF_WITH_PKGCONFIG)
       find_package(libdwarf REQUIRED)
@@ -412,20 +436,20 @@ if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF)
 endif()
 
 if(CPPTRACE_GET_SYMBOLS_WITH_DBGHELP)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_DBGHELP)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_GET_SYMBOLS_WITH_DBGHELP)
   target_link_libraries(${target_name} PRIVATE dbghelp)
 endif()
 
 if(CPPTRACE_GET_SYMBOLS_WITH_NOTHING)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_GET_SYMBOLS_WITH_NOTHING)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_GET_SYMBOLS_WITH_NOTHING)
 endif()
 
 # Unwinding
 if(CPPTRACE_UNWIND_WITH_UNWIND)
   if(NOT HAS_UNWIND)
     message(WARNING "Cpptrace: CPPTRACE_UNWIND_WITH_UNWIND specified but libgcc unwind doesn't seem to be available.")
   endif()
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_UNWIND_WITH_UNWIND)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_UNWIND_WITH_UNWIND)
 endif()
 
 if(CPPTRACE_UNWIND_WITH_LIBUNWIND)
@@ -461,56 +485,56 @@ if(CPPTRACE_UNWIND_WITH_LIBUNWIND)
       target_include_directories(${target_name} PRIVATE ${LIBUNWIND_INCLUDE_DIRS})
       target_link_libraries(${target_name} PRIVATE ${LIBUNWIND_LDFLAGS})
     endif()
-    target_compile_definitions(${target_name} PUBLIC CPPTRACE_UNWIND_WITH_LIBUNWIND UNW_LOCAL_ONLY)
+    target_compile_definitions(${target_name} PRIVATE CPPTRACE_UNWIND_WITH_LIBUNWIND UNW_LOCAL_ONLY)
   endif()
 endif()
 
 if(CPPTRACE_UNWIND_WITH_EXECINFO)
   if(NOT HAS_EXECINFO)
     message(WARNING "Cpptrace: CPPTRACE_UNWIND_WITH_EXECINFO specified but execinfo.h doesn't seem to be available.")
   endif()
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_UNWIND_WITH_EXECINFO)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_UNWIND_WITH_EXECINFO)
 endif()
 
 if(CPPTRACE_UNWIND_WITH_WINAPI)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_UNWIND_WITH_WINAPI)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_UNWIND_WITH_WINAPI)
 endif()
 
 if(CPPTRACE_UNWIND_WITH_DBGHELP)
   if(NOT HAS_STACKWALK)
     message(WARNING "Cpptrace: CPPTRACE_UNWIND_WITH_DBGHELP specified but dbghelp stackwalk64 doesn't seem to be available.")
   endif()
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_UNWIND_WITH_DBGHELP)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_UNWIND_WITH_DBGHELP)
   target_link_libraries(${target_name} PRIVATE dbghelp)
 endif()
 
 if(CPPTRACE_UNWIND_WITH_NOTHING)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_UNWIND_WITH_NOTHING)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_UNWIND_WITH_NOTHING)
 endif()
 
 # Demangling
 if(CPPTRACE_DEMANGLE_WITH_CXXABI)
   if(NOT HAS_CXXABI)
     message(WARNING "Cpptrace: CPPTRACE_DEMANGLE_WITH_CXXABI specified but cxxabi.h doesn't seem to be available.")
   endif()
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_DEMANGLE_WITH_CXXABI)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_DEMANGLE_WITH_CXXABI)
 endif()
 
 if(CPPTRACE_DEMANGLE_WITH_WINAPI)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_DEMANGLE_WITH_WINAPI)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_DEMANGLE_WITH_WINAPI)
   target_link_libraries(${target_name} PRIVATE dbghelp)
 endif()
 
 if(CPPTRACE_DEMANGLE_WITH_NOTHING)
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_DEMANGLE_WITH_NOTHING)
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_DEMANGLE_WITH_NOTHING)
 endif()
 
 if(NOT "${CPPTRACE_BACKTRACE_PATH}" STREQUAL "")
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_BACKTRACE_PATH=${CPPTRACE_BACKTRACE_PATH})
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_BACKTRACE_PATH=${CPPTRACE_BACKTRACE_PATH})
 endif()
 
 if(NOT "${CPPTRACE_HARD_MAX_FRAMES}" STREQUAL "")
-  target_compile_definitions(${target_name} PUBLIC CPPTRACE_HARD_MAX_FRAMES=${CPPTRACE_HARD_MAX_FRAMES})
+  target_compile_definitions(${target_name} PRIVATE CPPTRACE_HARD_MAX_FRAMES=${CPPTRACE_HARD_MAX_FRAMES})
 endif()
 
 # ====================================================== Install =======================================================