Merge branch 'john/erts/fix-call_error_handler-crash/OTP-19577/ERIERL-1220' into john/erts/fix-call_error_handler-crash-26/OTP-19577/ERIERL-1220

* john/erts/fix-call_error_handler-crash/OTP-19577/ERIERL-1220:
  erts: Fix 8815c05 for emu and non-native stack

Author: jhogberg

erts/emulator/beam/emu/beam_emu.c

@@ -547,7 +547,7 @@ void process_main(ErtsSchedulerData *esdp)
             Goto(*I);
         }
 
-        I = handle_error(c_p, I, reg, mfa);
+        I = handle_error(c_p, cp_val(*E), reg, mfa);
         goto post_error_handling;
     }
  OpCase(error_action_code): {

erts/emulator/beam/jit/x86/beam_asm_global.cpp

@@ -210,6 +210,14 @@ void BeamGlobalAssembler::emit_export_trampoline() {
 
     a.bind(error_handler);
     {
+        Label error;
+
+#ifdef NATIVE_ERLANG_STACK
+        error = labels[raise_exception];
+#else
+        error = a.newLabel();
+#endif
+
         a.lea(ARG2, x86::qword_ptr(RET, offsetof(Export, info.mfa)));
         a.mov(TMP_MEM1q, ARG2);
 
@@ -227,8 +235,17 @@ void BeamGlobalAssembler::emit_export_trampoline() {
 
         a.mov(ARG4, TMP_MEM1q);
         a.test(RET, RET);
-        a.je(labels[raise_exception]);
+        a.je(error);
         a.jmp(emit_setup_dispatchable_call(RET));
+
+#ifndef NATIVE_ERLANG_STACK
+        a.bind(error);
+        {
+            a.push(getCPRef());
+            a.mov(getCPRef(), imm(NIL));
+            a.jmp(labels[raise_exception]);
+        }
+#endif
     }
 }