Fix OP_RAISE: it must preserve stacktrace

Our OP_RAISE has been always wrong: it must use stacktrace argument, and
behave like raise/3 NIF.

Signed-off-by: Davide Bettio <davide@uninstall.it>

Author: bettio

libs/jit/src/jit.erl

@@ -1165,7 +1165,7 @@ first_pass(<<?OP_RAISE, Rest0/binary>>, MMod, MSt0, State0) ->
     {MSt2, ExcValue, Rest2} = decode_compact_term(Rest1, MMod, MSt1, State0),
     ?TRACE("OP_RAISE ~p, ~p\n", [Stacktrace, ExcValue]),
     MSt3 = MMod:call_primitive_last(MSt2, ?PRIM_RAISE, [
-        ctx, jit_state, offset, Stacktrace, ExcValue
+        ctx, jit_state, Stacktrace, ExcValue
     ]),
     ?ASSERT_ALL_NATIVE_FREE(MSt3),
     first_pass(Rest2, MMod, MSt3, State0);

src/libAtomVM/jit.c

@@ -337,13 +337,12 @@ static Context *jit_raise_error_tuple(Context *ctx, JITState *jit_state, int off
     return jit_handle_error(ctx, jit_state, 0);
 }
 
-static Context *jit_raise(Context *ctx, JITState *jit_state, int offset, term stacktrace, term exc_value)
+static Context *jit_raise(Context *ctx, JITState *jit_state, term stacktrace, term exc_value)
 {
-    TRACE("jit_raise: ctx->process_id = %" PRId32 ", offset = %d\n", ctx->process_id, offset);
+    TRACE("jit_raise: ctx->process_id = %" PRId32 "\n", ctx->process_id);
     context_set_exception_class(ctx, stacktrace_exception_class(stacktrace));
     ctx->exception_reason = exc_value;
-    ctx->exception_stacktrace
-        = stacktrace_create_raw(ctx, jit_state->module, offset);
+    ctx->exception_stacktrace = stacktrace;
     return jit_handle_error(ctx, jit_state, 0);
 }
 

src/libAtomVM/jit.h

@@ -114,7 +114,7 @@ struct ModuleNativeInterface
     void (*mailbox_next)(Context *ctx);
     void (*cancel_timeout)(Context *ctx);
     void (*clear_timeout_flag)(Context *ctx);
-    Context *(*raise)(Context *ctx, JITState *jit_state, int offset, term stacktrace, term exc_value);
+    Context *(*raise)(Context *ctx, JITState *jit_state, term stacktrace, term exc_value);
     Context *(*schedule_wait_cp)(Context *ctx, JITState *jit_state);
     Context *(*wait_timeout)(Context *ctx, JITState *jit_state, term timeout, int label);
     Context *(*wait_timeout_trap_handler)(Context *ctx, JITState *jit_state, int label);

src/libAtomVM/opcodesswitch.h

@@ -4058,9 +4058,6 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
             }
 
             case OP_RAISE: {
-                #ifdef IMPL_EXECUTE_LOOP
-                    const uint8_t *saved_pc = pc - 1;
-                #endif
                 term stacktrace;
                 DECODE_COMPACT_TERM(stacktrace, pc);
                 term exc_value;
@@ -4076,7 +4073,7 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
                     TRACE("raise/2 stacktrace=0x%" TERM_X_FMT " exc_value=0x%" TERM_X_FMT "\n", stacktrace, exc_value);
                     context_set_exception_class(ctx, stacktrace_exception_class(stacktrace));
                     ctx->exception_reason = exc_value;
-                    ctx->exception_stacktrace = stacktrace_create_raw(ctx, mod, saved_pc - code);
+                    ctx->exception_stacktrace = stacktrace;
                     goto handle_error;
                 #endif
 

tests/erlang_tests/test_reraise.erl

@@ -20,12 +20,19 @@
 
 -module(test_reraise).
 
--export([start/0]).
+-export([start/0, do_error/0]).
 
 start() ->
     start(?OTP_RELEASE).
 
 start(OTPVersion) when OTPVersion >= 23 ->
+    test_reraise_raise_3_nif(),
+    test_reraise_preserves_stacktrace(),
+    0;
+start(_) ->
+    0.
+
+test_reraise_raise_3_nif() ->
     try
         reraise_reraiser:reraise_error()
     catch
@@ -38,7 +45,30 @@ start(OTPVersion) when OTPVersion >= 23 ->
                 {reraise_reraiser, reraise_error, 0, _Meta2}
                 | _Rest
             ] = Stacktrace
-    end,
-    0;
-start(_) ->
-    0.
+    end.
+
+test_reraise_preserves_stacktrace() ->
+    try
+        try
+            ?MODULE:do_error()
+        catch
+            throw:_ -> should_not_happen
+        end
+    catch
+        error:my_error:ST ->
+            case ST of
+                L when is_list(L) ->
+                    true = has_do_error(L),
+                    ok;
+                _ ->
+                    %% Stacktraces disabled
+                    ok
+            end
+    end.
+
+do_error() ->
+    erlang:error(my_error).
+
+has_do_error([{?MODULE, do_error, _, _} | _]) -> true;
+has_do_error([_ | T]) -> has_do_error(T);
+has_do_error([]) -> false.