Merge branch 'lukas/erts/max_heap_size/OTP-13174'

* lukas/erts/max_heap_size/OTP-13174:
  erts: Fix max heap size exit when in hipe mode
  Update preloaded modules
  erts: Fix pre-bif yield current_function
  erts: Implement max_heap_size process flag

1 files changed, 39 insertions, 0 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 99eb26bec5..d00a563087 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -1704,6 +1704,14 @@ void process_main(void)
      BeamInstr *next;
      Eterm result;
 
+     if (!(FCALLS > 0 || FCALLS > neg_o_reds)) {
+         /* If we have run out of reductions, we do a context
+            switch before calling the bif */
+         c_p->arity = 2;
+         c_p->current = NULL;
+         goto context_switch3;
+     }
+
      PRE_BIF_SWAPOUT(c_p);
      c_p->fcalls = FCALLS - 1;
      result = erl_send(c_p, r(0), x(1));
@@ -2810,6 +2818,15 @@ do {						\
 	BeamInstr *next;
 	ErlHeapFragment *live_hf_end;
 
+
+        if (!((FCALLS - 1) > 0 || (FCALLS-1) > neg_o_reds)) {
+            /* If we have run out of reductions, we do a context
+               switch before calling the bif */
+            c_p->arity = ((Export *)Arg(0))->code[2];
+            c_p->current = ((Export *)Arg(0))->code;
+            goto context_switch3;
+        }
+
         if (ERTS_MSACC_IS_ENABLED_CACHED_X()) {
             if (GET_BIF_MODULE(Arg(0)) == am_ets) {
                 ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_ETS);
@@ -3338,10 +3355,19 @@ do {						\
  context_switch2:		/* Entry for fun calls. */
     c_p->current = I-3;		/* Pointer to Mod, Func, Arity */
 
+ context_switch3:
+
  {
      Eterm* argp;
      int i;
 
+     if (erts_smp_atomic32_read_nob(&c_p->state) & ERTS_PSFLG_EXITING) {
+         c_p->i = beam_exit;
+         c_p->arity = 0;
+         c_p->current = NULL;
+         goto do_schedule;
+     }
+
      /*
       * Make sure that there is enough room for the argument registers to be saved.
       */
@@ -3509,6 +3535,12 @@ do {						\
 	    BifFunction vbf;
 	    ErlHeapFragment *live_hf_end;
 
+            if (!((FCALLS - 1) > 0 || (FCALLS - 1) > neg_o_reds)) {
+                /* If we have run out of reductions, we do a context
+                   switch before calling the nif */
+                goto context_switch;
+            }
+
 	    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_NIF);
 
 	    DTRACE_NIF_ENTRY(c_p, (Eterm)I[-3], (Eterm)I[-2], (Uint)I[-1]);
@@ -3551,6 +3583,13 @@ do {						\
 	     * code[3]: &&apply_bif
 	     * code[4]: Function pointer to BIF function
 	     */
+
+            if (!((FCALLS - 1) > 0 || (FCALLS - 1) > neg_o_reds)) {
+                /* If we have run out of reductions, we do a context
+                   switch before calling the bif */
+                goto context_switch;
+            }
+
             if (ERTS_MSACC_IS_ENABLED_CACHED_X()) {
                 if ((Eterm)I[-3] == am_ets) {
                     ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_ETS);