Merge 'fix-static-nif-init-assertion-failure' into maint

OTP-19443 PR-9307 GH-9306
erlang · Jan 20, 2025 · 9b159d1 · 9b159d1
2 parents 2190324 + a14c946
commit 9b159d1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
@@ -4437,7 +4437,8 @@ void erts_add_taint(Eterm mod_atom)
 #endif
     struct tainted_module_t *first, *t;
 
-    ERTS_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(&erts_driver_list_lock)
+    ERTS_LC_ASSERT(!erts_initialized
+                   || erts_lc_rwmtx_is_rwlocked(&erts_driver_list_lock)
                    || erts_has_code_mod_permission());
 
     first = (struct tainted_module_t*) erts_atomic_read_nob(&first_taint);