Fixed reraise not caught issue

Signed-off-by: Mateusz Front <[email protected]>

Author: FKubisSWM

src/libAtomVM/opcodesswitch.h

@@ -1415,6 +1415,10 @@ static bool sort_kv_pairs(struct kv_pair *kv, int size, GlobalContext *global)
     return true;
 }
 
+static bool is_exception_class(term t) {
+    return t == ERROR_ATOM || t == LOWERCASE_EXIT_ATOM || t == THROW_ATOM;
+}
+
 static term maybe_alloc_boxed_integer_fragment(Context *ctx, avm_int64_t value)
 {
 #if BOXED_TERMS_REQUIRED_FOR_INT64 > 1
@@ -3746,6 +3750,12 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
                 #ifdef IMPL_EXECUTE_LOOP
                     TRACE("raise/2 stacktrace=0x%lx exc_value=0x%lx\n", stacktrace, exc_value);
                     if (stacktrace_is_built(stacktrace)) {
+                        //  FIXME: This is a temporary solution as in some niche cases of reraise the x_regs[0] is
+                        //  overwritten and it does not represent exception class
+                        if (!is_exception_class(x_regs[0])) {
+                            x_regs[0] = ERROR_ATOM;
+                        }
+                        x_regs[1] = exc_value;
                         x_regs[2] = stacktrace;
                     } else {
                         x_regs[0] = stacktrace_exception_class(stacktrace);

tests/erlang_tests/CMakeLists.txt

@@ -551,6 +551,10 @@ compile_assembler(test_op_bs_start_match_asm)
 compile_erlang(test_op_bs_create_bin)
 compile_assembler(test_op_bs_create_bin_asm)
 
+compile_erlang(test_reraise)
+compile_erlang(reraise_reraiser)
+compile_erlang(reraise_raiser)
+
 if(Erlang_VERSION VERSION_GREATER_EQUAL "23")
     set(OTP23_OR_GREATER_TESTS
         test_op_bs_start_match_asm.beam
@@ -1073,6 +1077,10 @@ add_custom_target(erlang_test_modules DEPENDS
     test_op_bs_start_match.beam
     test_op_bs_create_bin.beam
 
+    test_reraise.beam
+    reraise_reraiser.beam
+    reraise_raiser.beam
+
     ${OTP23_OR_GREATER_TESTS}
     ${OTP25_OR_GREATER_TESTS}
 )

tests/erlang_tests/reraise_raiser.erl

@@ -0,0 +1,6 @@
+-module(reraise_raiser).
+
+-export([raise_error/0]).
+
+raise_error() ->
+    error("foo").

tests/erlang_tests/reraise_reraiser.erl

@@ -0,0 +1,11 @@
+-module(reraise_reraiser).
+
+-export([reraise_error/0]).
+
+reraise_error() ->
+    try
+        reraise_raiser:raise_error()
+    catch
+        Class:Reason:Stacktrace ->
+            erlang:error(erlang:raise(Class, Reason, Stacktrace))
+    end.

tests/erlang_tests/test_reraise.erl

@@ -0,0 +1,19 @@
+-module(test_reraise).
+
+-export([start/0]).
+
+start() ->
+    try
+        reraise_reraiser:reraise_error()
+    catch
+        Class:Reason:Stacktrace ->
+            error = Class,
+            "foo" = Reason,
+
+            [
+                {reraise_raiser, raise_error, 0, _Meta1},
+                {reraise_reraiser, reraise_error, 0, _Meta2}
+                | _Rest
+            ] = Stacktrace
+    end,
+    0.

tests/test.c

@@ -598,6 +598,8 @@ struct Test tests[] = {
     TEST_CASE(test_ets),
     TEST_CASE(test_node),
 
+    TEST_CASE(test_reraise),
+
     // TEST CRASHES HERE: TEST_CASE(memlimit),
 
     { NULL, 0, false, false }