Merge branch 'PHP-8.4' into PHP-8.5

dstogov · dstogov · commit aa9964eebb8e · 2026-03-19T11:13:30.000+03:00
* PHP-8.4: Fix GH-21411: opcache_compile_file() fails to early-bind classes without parents (#21412)
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
@@ -347,6 +347,12 @@ static void zend_accel_do_delayed_early_binding(
 					: NULL;
 				if (parent_ce || (orig_ce->ce_flags & ZEND_ACC_LINKED)) {
 					ce = zend_try_early_bind(orig_ce, parent_ce, early_binding->lcname, zv);
+				} else if (ZSTR_LEN(early_binding->lc_parent_name) == 0) {
+					/* Parentless class: use the same binding path as the VM handler */
+					zval lcname_zv[2];
+					ZVAL_STR(&lcname_zv[0], early_binding->lcname);
+					ZVAL_STR(&lcname_zv[1], early_binding->rtd_key);
+					ce = zend_bind_class_in_slot(zv, lcname_zv, early_binding->lc_parent_name);
 				}
 			}
 			if (ce && early_binding->cache_slot != (uint32_t) -1) {

Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,12 @@ static void zend_accel_do_delayed_early_binding(`
`347`	`347`	`: NULL;`
`348`	`348`	`if (parent_ce \|\| (orig_ce->ce_flags & ZEND_ACC_LINKED)) {`
`349`	`349`	`ce = zend_try_early_bind(orig_ce, parent_ce, early_binding->lcname, zv);`
	`350`	`+ } else if (ZSTR_LEN(early_binding->lc_parent_name) == 0) {`
	`351`	`+ /* Parentless class: use the same binding path as the VM handler */`
	`352`	`+ zval lcname_zv[2];`
	`353`	`+ ZVAL_STR(&lcname_zv[0], early_binding->lcname);`
	`354`	`+ ZVAL_STR(&lcname_zv[1], early_binding->rtd_key);`
	`355`	`+ ce = zend_bind_class_in_slot(zv, lcname_zv, early_binding->lc_parent_name);`
`350`	`356`	`}`
`351`	`357`	`}`
`352`	`358`	`if (ce && early_binding->cache_slot != (uint32_t) -1) {`