Add backward

kevinjoseph1995 · Apr 27, 2023 · 778a9c3 · 778a9c3
1 parent d1cc690
commit 778a9c3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -16,10 +16,9 @@ add_library(lox_compiler STATIC
         error.cpp
         parser_state.cpp
         native_function.cpp)
-target_include_directories(lox_compiler PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(lox_compiler fmt)
 
+target_include_directories(lox_compiler PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(lox_compiler fmt Backward::Backward)
 target_compile_definitions(lox_compiler PRIVATE
         $<$<STREQUAL:${DEBUG_GC_LOGGING},ON>:DEBUG_GC_LOGGING=1>
         $<$<STREQUAL:${STRESS_TEST_GC},ON>:STRESS_TEST_GC=1>

diff --git a/src/error.h b/src/error.h
@@ -5,7 +5,8 @@
 #ifndef LOX_CPP_ERROR_H
 #define LOX_CPP_ERROR_H
 
-#include "fmt/core.h"
+#include <backward.hpp>
+#include <fmt/core.h>
 
 #include <expected>
 #include <stdio.h>
@@ -14,13 +15,15 @@
 
 auto PrintAssertionMessage(char const* file, int line, char const* function_name, char const* message = nullptr) -> void;
 
-// TODO: Print stack-trace here, research available solutions
-// Look into: https://github.com/bombela/backward-cpp/blob/master/backward.hpp
-#define unlikely(x) __builtin_expect(!!(x), 0)
 #define LOX_ASSERT(expr, ...)                                                               \
     do {                                                                                    \
         if ((!(expr))) [[unlikely]] {                                                       \
             PrintAssertionMessage(__FILE__, __LINE__, __func__ __VA_OPT__(, ) __VA_ARGS__); \
+            using namespace backward;                                                       \
+            StackTrace st;                                                                  \
+            st.load_here(32);                                                               \
+            Printer p;                                                                      \
+            p.print(st);                                                                    \
             __builtin_trap();                                                               \
         }                                                                                   \
     } while (0)

diff --git a/tests/test_compiler.cpp b/tests/test_compiler.cpp
@@ -2,6 +2,7 @@
 // Created by kevin on 8/11/22.
 //
 
+#include "error.h"
 #include "fmt/core.h"
 #include "gtest/gtest.h"
 #include <memory>

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -8,5 +8,5 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-restrict")
 endif ()
 
-
+add_subdirectory(backward-cpp)
 add_subdirectory(googletest)