Skip to content

Commit 1679745

Browse files
committed
Merge branch 'lukas/erts/remove-faulty-dirty-free-proc-assert' into maint
* lukas/erts/remove-faulty-dirty-free-proc-assert: erts: Remove faulty assert checking for DELAYED_DEL_PROC flag
2 parents 486db63 + 1e0dfe2 commit 1679745

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

erts/emulator/beam/erl_process.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9502,9 +9502,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
95029502
erts_aint32_t state = 0; /* Suppress warning... */
95039503
int is_normal_sched;
95049504
ErtsSchedType sched_type;
9505-
#ifdef DEBUG
9506-
int aborted_execution = 0;
9507-
#endif
95089505

95099506
ERTS_MSACC_DECLARE_CACHE();
95109507

@@ -9662,11 +9659,7 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
96629659
ERTS_MSACC_SET_STATE_CACHED(ERTS_MSACC_STATE_OTHER);
96639660

96649661
if (state & ERTS_PSFLG_FREE) {
9665-
if (!is_normal_sched) {
9666-
ASSERT((p->flags & F_DELAYED_DEL_PROC)
9667-
|| aborted_execution);
9668-
}
9669-
else {
9662+
if (is_normal_sched) {
96709663
ASSERT(esdp->free_process == p);
96719664
esdp->free_process = NULL;
96729665
}
@@ -9691,10 +9684,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
96919684
ErtsMigrationPaths *mps;
96929685
ErtsMigrationPath *mp;
96939686

9694-
#ifdef DEBUG
9695-
aborted_execution = 0;
9696-
#endif
9697-
96989687
if (is_normal_sched) {
96999688

97009689
if (esdp->check_time_reds >= ERTS_CHECK_TIME_REDS)
@@ -10130,9 +10119,6 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
1013010119
erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
1013110120
if (ERTS_IS_P_TRACED(p))
1013210121
trace_schedule_in(p, state);
10133-
#ifdef DEBUG
10134-
aborted_execution = !0;
10135-
#endif
1013610122
goto sched_out_proc;
1013710123
}
1013810124
break;

0 commit comments

Comments
 (0)