Merge branch 'lukas/erts/non-smp-debug-fixes/OTP-13047'

* lukas/erts/non-smp-debug-fixes/OTP-13047:
  erts: Fix incorrect non-smp debug assert
  erts: std_alloc is not thread safe on non-smp

Conflicts:
	erts/emulator/beam/erl_alloc_util.c

2 files changed, 21 insertions, 14 deletions

diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index ad62a87326..ba216c7eb4 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -264,7 +264,6 @@ type	PRTSD		STANDARD	SYSTEM		port_specific_data
 type	CPUDATA		LONG_LIVED	SYSTEM		cpu_data
 type	TMP_CPU_IDS	SHORT_LIVED	SYSTEM		tmp_cpu_ids
 type	EXT_TERM_DATA	SHORT_LIVED	PROCESSES	external_term_data
-type	ZLIB		STANDARD	SYSTEM		zlib
 type	CPU_GRPS_MAP	LONG_LIVED	SYSTEM		cpu_groups_map
 type	AUX_WORK_TMO	LONG_LIVED	SYSTEM		aux_work_timeouts
 type	MISC_AUX_WORK_Q	LONG_LIVED	SYSTEM		misc_aux_work_q
@@ -297,8 +296,10 @@ type	THR_Q_LL	LONG_LIVED	SYSTEM		long_lived_thr_queue
 
 +if smp
 type	ASYNC		SHORT_LIVED	SYSTEM		async
+type	ZLIB		STANDARD	SYSTEM		zlib
 +else
-# sl_alloc is not thread safe in non smp build; therefore, we use driver_alloc
+# sl/std_alloc is not thread safe in non smp build; therefore, we use driver_alloc
+type	ZLIB		DRIVER   	SYSTEM		zlib
 type	ASYNC		DRIVER		SYSTEM		async
 +endif
 
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index be7c16cc05..2995f2f822 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -860,8 +860,9 @@ erts_alcu_literal_32_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
 {
     void* res;
     Uint sz = ERTS_SUPERALIGNED_CEILING(*size_p);
-    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
-                   && !allctr->t && allctr->thread_safe);
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL &&
+                   allctr->t == 0);
+    ERTS_SMP_LC_ASSERT(allctr->thread_safe);
 
     res = erts_alcu_mseg_alloc(allctr, &sz, flags);
     if (res) {
@@ -877,8 +878,9 @@ erts_alcu_literal_32_mseg_realloc(Allctr_t *allctr, void *seg,
 {
     void* res;
     Uint new_sz = ERTS_SUPERALIGNED_CEILING(*new_size_p);
-    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
-                   && !allctr->t && allctr->thread_safe);
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL &&
+                   allctr->t == 0);
+    ERTS_SMP_LC_ASSERT(allctr->thread_safe);
 
     if (seg && old_size)
         clear_literal_range(seg, old_size);
@@ -894,8 +896,9 @@ void
 erts_alcu_literal_32_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size,
                                Uint flags)
 {
-    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
-                   && !allctr->t && allctr->thread_safe);
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL &&
+                   allctr->t == 0);
+    ERTS_SMP_LC_ASSERT(allctr->thread_safe);
 
     erts_alcu_mseg_dealloc(allctr, seg, size, flags);
 
@@ -1007,8 +1010,9 @@ erts_alcu_literal_32_sys_alloc(Allctr_t *allctr, Uint* size_p, int superalign)
 {
     void* res;
     Uint size = ERTS_SUPERALIGNED_CEILING(*size_p);
-    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
-                   && !allctr->t && allctr->thread_safe);
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL &&
+                   allctr->t == 0);
+    ERTS_SMP_LC_ASSERT(allctr->thread_safe);
 
     res = erts_alcu_sys_alloc(allctr, &size, 1);
     if (res) {
@@ -1024,8 +1028,9 @@ erts_alcu_literal_32_sys_realloc(Allctr_t *allctr, void *ptr, Uint* size_p, Uint
     void* res;
     Uint size = ERTS_SUPERALIGNED_CEILING(*size_p);
 
-    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
-                   && !allctr->t && allctr->thread_safe);
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL &&
+                   allctr->t == 0);
+    ERTS_SMP_LC_ASSERT(allctr->thread_safe);
 
     if (ptr && old_size)
         clear_literal_range(ptr, old_size);
@@ -1040,8 +1045,9 @@ erts_alcu_literal_32_sys_realloc(Allctr_t *allctr, void *ptr, Uint* size_p, Uint
 void
 erts_alcu_literal_32_sys_dealloc(Allctr_t *allctr, void *ptr, Uint size, int superalign)
 {
-    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
-                   && !allctr->t && allctr->thread_safe);
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL &&
+                   allctr->t == 0);
+    ERTS_SMP_LC_ASSERT(allctr->thread_safe);
 
     erts_alcu_sys_dealloc(allctr, ptr, size, 1);