Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

erts: Remove faulty assert checking for DELAYED_DEL_PROC flag #9451

Merged
merged 1 commit into from
Feb 20, 2025
+1 −15
Merged

erts: Remove faulty assert checking for DELAYED_DEL_PROC flag #9451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions erts/emulator/beam/erl_process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9499,9 +9499,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();

Expand Down Expand Up @@ -9659,11 +9656,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;
}
Expand All @@ -9688,10 +9681,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)
Expand Down Expand Up @@ -10127,9 +10116,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;
Expand Down
Loading