Merge branch 'maint'

erlang · Feb 20, 2025 · 0918af7 · 0918af7
2 parents a02f9da + 1679745
commit 0918af7
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
@@ -9508,9 +9508,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
     erts_aint32_t state = 0; /* Suppress warning... */
     int is_normal_sched;
     ErtsSchedType sched_type;
-#ifdef DEBUG
-    int aborted_execution = 0;
-#endif
 
     ERTS_MSACC_DECLARE_CACHE();
 
@@ -9668,11 +9665,7 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
             ERTS_MSACC_SET_STATE_CACHED(ERTS_MSACC_STATE_OTHER);
 
             if (state & ERTS_PSFLG_FREE) {
-                if (!is_normal_sched) {
-                    ASSERT((p->flags & F_DELAYED_DEL_PROC)
-                           || aborted_execution);
-                }
-                else {
+                if (is_normal_sched) {
                     ASSERT(esdp->free_process == p);
                     esdp->free_process = NULL;
                 }
@@ -9697,10 +9690,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 	ErtsMigrationPaths *mps;
 	ErtsMigrationPath *mp;
 
-#ifdef DEBUG
-        aborted_execution = 0;
-#endif
-
 	if (is_normal_sched) {
 
 	    if (esdp->check_time_reds >= ERTS_CHECK_TIME_REDS)
@@ -10138,9 +10127,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 		erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
                 if (ERTS_IS_P_TRACED(p))
                     trace_schedule_in(p, state);
-#ifdef DEBUG
-                aborted_execution = !0;
-#endif
 		goto sched_out_proc;
 	    }
             break;