Don't be lazy, fix it entirely in ext/opcache

Author: rlerdorf

Zend/zend_inheritance.c

@@ -3375,9 +3375,7 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
 	}
 
 	uint32_t is_cacheable = ce->ce_flags & ZEND_ACC_IMMUTABLE;
-	if (parent_ce) {
-		UPDATE_IS_CACHEABLE(parent_ce);
-	}
+	UPDATE_IS_CACHEABLE(parent_ce);
 	if (is_cacheable) {
 		if (zend_inheritance_cache_get && zend_inheritance_cache_add) {
 			zend_class_entry *ret = zend_inheritance_cache_get(ce, parent_ce, NULL);
@@ -3394,14 +3392,10 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
 		proto = ce;
 	}
 
-	if (parent_ce) {
-		orig_linking_class = CG(current_linking_class);
-		CG(current_linking_class) = NULL;
-		status = zend_can_early_bind(ce, parent_ce);
-		CG(current_linking_class) = orig_linking_class;
-	} else {
-		status = INHERITANCE_SUCCESS;
-	}
+	orig_linking_class = CG(current_linking_class);
+	CG(current_linking_class) = NULL;
+	status = zend_can_early_bind(ce, parent_ce);
+	CG(current_linking_class) = orig_linking_class;
 	if (EXPECTED(status != INHERITANCE_UNRESOLVED)) {
 		if (ce->ce_flags & ZEND_ACC_IMMUTABLE) {
 			/* Lazy class loading */
@@ -3426,11 +3420,9 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
 				zend_begin_record_errors();
 			}
 
-			if (parent_ce) {
-				zend_do_inheritance_ex(ce, parent_ce, status == INHERITANCE_SUCCESS);
-				if (parent_ce->num_interfaces) {
-					zend_do_inherit_interfaces(ce, parent_ce);
-				}
+			zend_do_inheritance_ex(ce, parent_ce, status == INHERITANCE_SUCCESS);
+			if (parent_ce && parent_ce->num_interfaces) {
+				zend_do_inherit_interfaces(ce, parent_ce);
 			}
 			zend_build_properties_info_table(ce);
 			if ((ce->ce_flags & (ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) == ZEND_ACC_IMPLICIT_ABSTRACT_CLASS) {

ext/opcache/zend_accelerator_util_funcs.c

@@ -360,9 +360,14 @@ static void zend_accel_do_delayed_early_binding(
 				zend_class_entry *parent_ce = !(orig_ce->ce_flags & ZEND_ACC_LINKED)
 					? zend_hash_find_ex_ptr(EG(class_table), early_binding->lc_parent_name, 1)
 					: NULL;
-				if (parent_ce || (orig_ce->ce_flags & ZEND_ACC_LINKED)
-					|| ZSTR_LEN(early_binding->lc_parent_name) == 0) {
+				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) {