Merge branch 'master' into v2.1

author Mike Pall <mike>

Sat, 23 Dec 2023 18:49:43 +0000 (19:49 +0100)

committer Mike Pall <mike>

Sat, 23 Dec 2023 18:49:43 +0000 (19:49 +0100)
author Mike Pall <mike>
Sat, 23 Dec 2023 18:49:43 +0000 (19:49 +0100)
committer Mike Pall <mike>
Sat, 23 Dec 2023 18:49:43 +0000 (19:49 +0100)
diff --cc src/lj_ir.h
Simple merge
diff --cc src/lj_opt_mem.c
Simple merge
		1	2
src/lj_ir.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_opt_mem.c	patch \|	diff1 \|	diff2 \|	blob \| history