Fix MACOS ZTS in IR JIT

dstogov · dstogov · commit a5a18f5af0b4 · 2023-09-05T10:15:12.000+03:00
diff --git a/ext/opcache/jit/ir b/ext/opcache/jit/ir
@@ -1 +1 @@
-Subproject commit 02afd0a89f4a9122bfaea11b7fcbafb8c4517046
+Subproject commit f44e897bb20d0d68e54c80ef8bb8109fb067820e
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -457,7 +457,7 @@ static ir_ref jit_TLS(zend_jit_ctx *jit)
 	}
 	jit->tls = ir_TLS(
 		tsrm_ls_cache_tcb_offset ? tsrm_ls_cache_tcb_offset : tsrm_tls_index,
-		tsrm_ls_cache_tcb_offset ? 0 : tsrm_tls_offset);
+		tsrm_ls_cache_tcb_offset ? IR_NULL : tsrm_tls_offset);
 	return jit->tls;
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ static ir_ref jit_TLS(zend_jit_ctx *jit)`
`457`	`457`	`}`
`458`	`458`	`jit->tls = ir_TLS(`
`459`	`459`	`tsrm_ls_cache_tcb_offset ? tsrm_ls_cache_tcb_offset : tsrm_tls_index,`
`460`		`- tsrm_ls_cache_tcb_offset ? 0 : tsrm_tls_offset);`
	`460`	`+ tsrm_ls_cache_tcb_offset ? IR_NULL : tsrm_tls_offset);`
`461`	`461`	`return jit->tls;`
`462`	`462`	`}`
`463`	`463`	`#endif`