adds experimental support for C++20 modules

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.15...4.0)
 
 include(cmake/PreventInSourceBuilds.cmake)
 
@@ -156,6 +156,14 @@ target_sources(
     src/platform/dbghelp_utils.cpp
 )
 
+if(HAS_CXX20_MODULES)
+  target_sources(
+    ${target_name} PUBLIC
+    FILE_SET CXX_MODULES
+    FILES "src/cpptrace_module.cpp"
+  )
+endif()
+
 target_include_directories(
   ${target_name}
   PUBLIC

cmake/Autoconfig.cmake

@@ -26,6 +26,19 @@ else()
   check_support(HAS_STACKWALK has_stackwalk.cpp "" "dbghelp" "")
 endif()
 
+if(CMAKE_CXX_STANDARD GREATER_EQUAL 20)
+  # check_cxx_source_compiles doesn't support modules (yet?) so we need to drop
+  # to a raw try_compile.
+  try_compile(
+    HAS_CXX20_MODULES
+    SOURCES_TYPE CXX_MODULE
+    SOURCES "${CMAKE_CURRENT_LIST_DIR}/has_modules.cpp"
+    CXX_STANDARD 20
+    CXX_STANDARD_REQUIRED Yes
+    CXX_EXTENSIONS Yes
+  )
+endif()
+
 if(NOT WIN32 OR MINGW)
   check_support(HAS_BACKTRACE has_backtrace.cpp "" "backtrace" "${CPPTRACE_BACKTRACE_PATH_DEFINITION}")
   set(STACKTRACE_LINK_LIB "stdc++_libbacktrace")

cmake/InstallRules.cmake

@@ -25,6 +25,7 @@ install(
   ARCHIVE #
   COMPONENT ${package_name}_development
   INCLUDES #
+  FILE_SET CXX_MODULES
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
 

cmake/has_modules.cpp

@@ -0,0 +1,4 @@
+export module cpptrace;
+
+int main()
+{}

include/cpptrace/exceptions.hpp

@@ -2,6 +2,7 @@
 #define CPPTRACE_EXCEPTIONS_HPP
 
 #include <cpptrace/basic.hpp>
+#include <cpptrace/exceptions_macros.hpp>
 
 #include <exception>
 #include <system_error>
@@ -195,23 +196,6 @@ CPPTRACE_BEGIN_NAMESPACE
     [[noreturn]] CPPTRACE_EXPORT void rethrow_and_wrap_if_needed(std::size_t skip = 0);
 CPPTRACE_END_NAMESPACE
 
-// Exception wrapper utilities
-#define CPPTRACE_WRAP_BLOCK(statements) do { \
-        try { \
-            statements \
-        } catch(...) { \
-            ::cpptrace::rethrow_and_wrap_if_needed(); \
-        } \
-    } while(0)
-
-#define CPPTRACE_WRAP(expression) [&] () -> decltype((expression)) { \
-        try { \
-            return expression; \
-        } catch(...) { \
-            ::cpptrace::rethrow_and_wrap_if_needed(1); \
-        } \
-    } ()
-
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif

include/cpptrace/exceptions_macros.hpp

@@ -0,0 +1,21 @@
+#ifndef CPPTRACE_EXCEPTIONS_MACROS_HPP
+#define CPPTRACE_EXCEPTIONS_MACROS_HPP
+
+// Exception wrapper utilities
+#define CPPTRACE_WRAP_BLOCK(statements) do { \
+        try { \
+            statements \
+        } catch(...) { \
+            ::cpptrace::rethrow_and_wrap_if_needed(); \
+        } \
+    } while(0)
+
+#define CPPTRACE_WRAP(expression) [&] () -> decltype((expression)) { \
+        try { \
+            return expression; \
+        } catch(...) { \
+            ::cpptrace::rethrow_and_wrap_if_needed(1); \
+        } \
+    } ()
+
+#endif // CPPTRACE_EXCEPTIONS_MACROS_HPP

include/cpptrace/from_current.hpp

@@ -10,21 +10,7 @@
 #endif
 
 #include <cpptrace/basic.hpp>
-
-// https://godbolt.org/z/4MsT6KqP1
-#ifdef _MSC_VER
- #define CPPTRACE_UNREACHABLE() __assume(false)
-#else
- #define CPPTRACE_UNREACHABLE() __builtin_unreachable()
-#endif
-
-// https://godbolt.org/z/7neGPEche
-// gcc added support in 4.8 but I'm too lazy to check the minor version
-#if defined(__GNUC__) && (__GNUC__ < 5)
- #define CPPTRACE_NORETURN __attribute__((noreturn))
-#else
- #define CPPTRACE_NORETURN [[noreturn]]
-#endif
+#include <cpptrace/from_current_macros.hpp>
 
 CPPTRACE_BEGIN_NAMESPACE
     CPPTRACE_EXPORT const raw_trace& raw_trace_from_current_exception();
@@ -100,39 +86,7 @@ CPPTRACE_BEGIN_NAMESPACE
          inline void nop(int) {}
         #endif
     }
-CPPTRACE_END_NAMESPACE
 
-#ifdef _MSC_VER
- #define CPPTRACE_TYPE_FOR(param) \
-     ::cpptrace::detail::argument<void(param)>::type
- // this awful double-IILE is due to C2713 "You can't use structured exception handling (__try/__except) and C++
- // exception handling (try/catch) in the same function."
- #define CPPTRACE_TRY \
-     try { \
-         [&]() { \
-             __try { \
-                 [&]() {
- #define CPPTRACE_CATCH(param) \
-                 }(); \
-             } __except(::cpptrace::detail::exception_filter<CPPTRACE_TYPE_FOR(param)>(GetExceptionInformation())) {} \
-         }(); \
-     } catch(param)
-#else
- #define CPPTRACE_UNWIND_INTERCEPTOR_FOR(param) \
-     ::cpptrace::detail::unwind_interceptor_for<void(param)>
- #define CPPTRACE_TRY \
-     try { \
-         try {
- #define CPPTRACE_CATCH(param) \
-         } catch(const CPPTRACE_UNWIND_INTERCEPTOR_FOR(param)&) { \
-             CPPTRACE_UNREACHABLE(); \
-             /* force instantiation of the init-er */ \
-             ::cpptrace::detail::nop(CPPTRACE_UNWIND_INTERCEPTOR_FOR(param)::init); \
-         } \
-     } catch(param)
-#endif
-
-CPPTRACE_BEGIN_NAMESPACE
     namespace detail {
         template<typename R, typename Arg>
         Arg get_callable_argument_helper(R(*) (Arg));
@@ -194,9 +148,4 @@ CPPTRACE_BEGIN_NAMESPACE
     }
 CPPTRACE_END_NAMESPACE
 
-#ifdef CPPTRACE_UNPREFIXED_TRY_CATCH
- #define TRY CPPTRACE_TRY
- #define CATCH(param) CPPTRACE_CATCH(param)
-#endif
-
 #endif

include/cpptrace/from_current_macros.hpp

@@ -0,0 +1,54 @@
+#ifndef CPPTRACE_FROM_CURRENT_MACROS_HPP
+#define CPPTRACE_FROM_CURRENT_MACROS_HPP
+
+// https://godbolt.org/z/4MsT6KqP1
+#ifdef _MSC_VER
+ #define CPPTRACE_UNREACHABLE() __assume(false)
+#else
+ #define CPPTRACE_UNREACHABLE() __builtin_unreachable()
+#endif
+
+// https://godbolt.org/z/7neGPEche
+// gcc added support in 4.8 but I'm too lazy to check the minor version
+#if defined(__GNUC__) && (__GNUC__ < 5)
+ #define CPPTRACE_NORETURN __attribute__((noreturn))
+#else
+ #define CPPTRACE_NORETURN [[noreturn]]
+#endif
+
+#ifdef _MSC_VER
+ #define CPPTRACE_TYPE_FOR(param) \
+     ::cpptrace::detail::argument<void(param)>::type
+ // this awful double-IILE is due to C2713 "You can't use structured exception handling (__try/__except) and C++
+ // exception handling (try/catch) in the same function."
+ #define CPPTRACE_TRY \
+     try { \
+         [&]() { \
+             __try { \
+                 [&]() {
+ #define CPPTRACE_CATCH(param) \
+                 }(); \
+             } __except(::cpptrace::detail::exception_filter<CPPTRACE_TYPE_FOR(param)>(GetExceptionInformation())) {} \
+         }(); \
+     } catch(param)
+#else
+ #define CPPTRACE_UNWIND_INTERCEPTOR_FOR(param) \
+     ::cpptrace::detail::unwind_interceptor_for<void(param)>
+ #define CPPTRACE_TRY \
+     try { \
+         try {
+ #define CPPTRACE_CATCH(param) \
+         } catch(const CPPTRACE_UNWIND_INTERCEPTOR_FOR(param)&) { \
+             CPPTRACE_UNREACHABLE(); \
+             /* force instantiation of the init-er */ \
+             ::cpptrace::detail::nop(CPPTRACE_UNWIND_INTERCEPTOR_FOR(param)::init); \
+         } \
+     } catch(param)
+#endif
+
+#ifdef CPPTRACE_UNPREFIXED_TRY_CATCH
+ #define TRY CPPTRACE_TRY
+ #define CATCH(param) CPPTRACE_CATCH(param)
+#endif
+
+#endif // CPPTRACE_FROM_CURRENT_MACROS_HPP

src/cpptrace_module.cpp

@@ -0,0 +1,108 @@
+module;
+#include <cpptrace/basic.hpp>
+#include <cpptrace/cpptrace.hpp>
+#include <cpptrace/exceptions.hpp>
+#include <cpptrace/formatting.hpp>
+#include <cpptrace/forward.hpp>
+#include <cpptrace/from_current.hpp>
+#include <cpptrace/gdb_jit.hpp>
+
+export module cpptrace;
+
+namespace cpptrace::inline v1 {
+  // cpptrace/basic
+  export using cpptrace::raw_trace;
+  export using cpptrace::object_frame;
+  export using cpptrace::object_trace;
+  export using cpptrace::nullable;
+  export using cpptrace::stacktrace_frame;
+  export using cpptrace::stacktrace;
+  export using cpptrace::generate_raw_trace;
+  export using cpptrace::generate_object_trace;
+  export using cpptrace::generate_trace;
+  export using cpptrace::safe_generate_raw_trace;
+  export using cpptrace::safe_object_frame;
+  export using cpptrace::can_get_safe_object_frame;
+  export using cpptrace::can_signal_safe_unwind;
+  export using cpptrace::can_get_safe_object_frame;
+  export using cpptrace::register_jit_object;
+  export using cpptrace::unregister_jit_object;
+  export using cpptrace::clear_all_jit_objects;
+
+  // cpptrace/exceptions
+  export using cpptrace::exception;
+  export using cpptrace::lazy_exception;
+  export using cpptrace::exception_with_message;
+  export using cpptrace::logic_error;
+  export using cpptrace::domain_error;
+  export using cpptrace::invalid_argument;
+  export using cpptrace::length_error;
+  export using cpptrace::out_of_range;
+  export using cpptrace::runtime_error;
+  export using cpptrace::range_error;
+  export using cpptrace::overflow_error;
+  export using cpptrace::underflow_error;
+  export using cpptrace::nested_exception;
+  export using cpptrace::system_error;
+  export using cpptrace::rethrow_and_wrap_if_needed;
+
+  // cpptrace/formatting
+  export using cpptrace::basename;
+  export using cpptrace::prettify_symbol;
+  export using cpptrace::formatter;
+  export using cpptrace::get_default_formatter;
+
+  // cpptrace/forward
+  export using cpptrace::frame_ptr;
+
+  // cpptrace/from_current.hpp
+  export using cpptrace::raw_trace_from_current_exception;
+  export using cpptrace::from_current_exception;
+  export using cpptrace::raw_trace_from_current_exception_rethrow;
+  export using cpptrace::from_current_exception_rethrow;
+  export using cpptrace::current_exception_was_rethrown;
+  export using cpptrace::rethrow;
+  export using cpptrace::clear_current_exception_traces;
+  export using cpptrace::try_catch;
+
+  namespace detail {
+#ifdef _MSC_VER
+    export using cpptrace::detail::argument;
+    export using cpptrace::detail::exception_filter;
+#else
+    export using cpptrace::detail::unwind_interceptor_for;
+    export using cpptrace::detail::nop;
+#endif
+  }
+
+  // cpptrace/gdb_jit
+  namespace experimental {
+    export using cpptrace::experimental::register_jit_objects_from_gdb_jit_interface;
+  }
+
+  // cpptrace/io
+  export using cpptrace::operator<<; // FIXME: make hidden friend
+
+  // cpptrace/utils
+  export using cpptrace::demangle;
+  export using cpptrace::get_snippet;
+  export using cpptrace::isatty;
+  export using cpptrace::stdin_fileno;
+  export using cpptrace::stderr_fileno;
+  export using cpptrace::stdout_fileno;
+  export using cpptrace::register_terminate_handler;
+  export using cpptrace::absorb_trace_exceptions;
+  export using cpptrace::enable_inlined_call_resolution;
+  export using cpptrace::cache_mode;
+  export using cpptrace::log_level;
+  export using cpptrace::set_log_level;
+  export using cpptrace::set_log_callback;
+  export using cpptrace::use_default_stderr_logger;
+  export using cpptrace::cache_mode;
+
+  namespace experimental {
+    export using cpptrace::experimental::set_cache_mode;
+    export using cpptrace::experimental::set_dwarf_resolver_line_table_cache_size;
+    export using cpptrace::experimental::set_dwarf_resolver_disable_aranges;
+  }
+}

test/BUILD.bazel

@@ -24,4 +24,31 @@ cc_test(
         "CPPTRACE_NO_TEST_SNIPPETS"
     ],
     linkstatic = 1,
-)
+)
+cc_test(
+    name = "unittest_module",
+    deps = [
+        "//:cpptrace_module",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main"
+    ],
+    srcs = [
+        "unit/main.cpp",
+        "unit/tracing/common.hpp",
+        "unit/tracing/raw_trace.cpp",
+        "unit/tracing/object_trace.cpp",
+        "unit/tracing/stacktrace.cpp",
+        "unit/tracing/from_current.cpp",
+        "unit/tracing/traced_exception.cpp",
+        "unit/internals/optional.cpp",
+        "unit/internals/result.cpp",
+        "unit/internals/string_utils.cpp",
+        "unit/internals/general.cpp",
+        "unit/lib/formatting.cpp",
+        "unit/lib/nullable.cpp"
+    ],
+    local_defines = [
+        "CPPTRACE_NO_TEST_SNIPPETS"
+    ],
+    linkstatic = 1,
+)