Also fix JIT

nielsdos · nielsdos · commit 81f1465d7566 · 2025-02-23T19:57:17.000+01:00
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -2084,7 +2084,7 @@ static void ZEND_FASTCALL zend_jit_fetch_obj_w_slow(zend_object *zobj)
 
 			if (opline->op2_type == IS_CONST) {
 				prop_info = CACHED_PTR_EX(cache_slot + 2);
-				if (!prop_info) {
+				if (!prop_info || !EXPECTED(zobj->ce == CACHED_PTR_EX(cache_slot))) {
 					break;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -2084,7 +2084,7 @@ static void ZEND_FASTCALL zend_jit_fetch_obj_w_slow(zend_object *zobj)`
`2084`	`2084`
`2085`	`2085`	`if (opline->op2_type == IS_CONST) {`
`2086`	`2086`	`prop_info = CACHED_PTR_EX(cache_slot + 2);`
`2087`		`- if (!prop_info) {`
	`2087`	`+ if (!prop_info \|\| !EXPECTED(zobj->ce == CACHED_PTR_EX(cache_slot))) {`
`2088`	`2088`	`break;`
`2089`	`2089`	`}`
`2090`	`2090`	`}`