Fix GH-21411: opcache_compile_file() fails to early-bind classes without parents

Author: rlerdorf

Zend/zend_inheritance.c

@@ -3375,7 +3375,9 @@ 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;
-	UPDATE_IS_CACHEABLE(parent_ce);
+	if (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);
@@ -3392,10 +3394,14 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
 		proto = 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;
+	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;
+	}
 	if (EXPECTED(status != INHERITANCE_UNRESOLVED)) {
 		if (ce->ce_flags & ZEND_ACC_IMMUTABLE) {
 			/* Lazy class loading */
@@ -3420,9 +3426,11 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
 				zend_begin_record_errors();
 			}
 
-			zend_do_inheritance_ex(ce, parent_ce, status == INHERITANCE_SUCCESS);
-			if (parent_ce && parent_ce->num_interfaces) {
-				zend_do_inherit_interfaces(ce, parent_ce);
+			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_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/tests/opcache_compile_file_early_bind_no_parent.inc

@@ -0,0 +1,5 @@
+<?php
+echo NoParentClass::VALUE . "\n";
+class NoParentClass {
+    const VALUE = "hello";
+}

ext/opcache/tests/opcache_compile_file_early_bind_no_parent.phpt

@@ -0,0 +1,81 @@
+--TEST--
+opcache_compile_file() should early-bind parentless classes
+--EXTENSIONS--
+opcache
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+--FILE--
+<?php
+$cacheDir = __DIR__ . '/opcache_early_bind_no_parent_cache';
+@mkdir($cacheDir, 0777, true);
+
+$incFile = __DIR__ . '/opcache_compile_file_early_bind_no_parent.inc';
+$php = PHP_BINARY;
+
+/* Detect opcache extension path for subprocess invocations.
+ * Always search for the shared module since subprocesses won't inherit
+ * the parent's zend_extension settings from run-tests.php. */
+$opcacheExt = '';
+$candidates = [
+    ini_get('extension_dir') . '/opcache.so',
+    ini_get('extension_dir') . '/opcache',
+    dirname(PHP_BINARY, 3) . '/modules/opcache.so',
+    dirname(PHP_BINARY, 2) . '/modules/opcache.so',
+];
+foreach ($candidates as $path) {
+    $real = realpath($path);
+    if ($real !== false) {
+        $opcacheExt = '-d zend_extension=' . escapeshellarg($real);
+        break;
+    }
+}
+
+$opcacheArgs = implode(' ', array_filter([
+    '-n',
+    $opcacheExt,
+    '-d opcache.enable=1',
+    '-d opcache.enable_cli=1',
+    '-d opcache.file_cache=' . escapeshellarg($cacheDir),
+    '-d opcache.file_cache_only=1',
+    '-d opcache.file_update_protection=0',
+    '-d opcache.jit=disable',
+]));
+
+/* First invocation: compile the file into file cache */
+$cmd = "$php $opcacheArgs -r " . escapeshellarg(
+    'opcache_compile_file(' . var_export($incFile, true) . '); echo "compiled\n";'
+);
+echo shell_exec($cmd);
+
+/* Second invocation: include the file from file cache.
+ * The parentless class must be early-bound for NoParentClass::VALUE
+ * to be accessible before the ZEND_DECLARE_CLASS_DELAYED opcode runs. */
+$cmd = "$php $opcacheArgs -r " . escapeshellarg(
+    'include ' . var_export($incFile, true) . '; echo "included\n";'
+);
+echo shell_exec($cmd);
+?>
+--CLEAN--
+<?php
+function removeDirRecursive($dir) {
+    if (!is_dir($dir)) return;
+    $iterator = new RecursiveIteratorIterator(
+        new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
+        RecursiveIteratorIterator::CHILD_FIRST
+    );
+    foreach ($iterator as $fileinfo) {
+        if ($fileinfo->isDir()) {
+            @rmdir($fileinfo->getRealPath());
+        } else {
+            @unlink($fileinfo->getRealPath());
+        }
+    }
+    @rmdir($dir);
+}
+removeDirRecursive(__DIR__ . '/opcache_early_bind_no_parent_cache');
+?>
+--EXPECT--
+compiled
+hello
+included

ext/opcache/zend_accelerator_util_funcs.c

@@ -360,7 +360,8 @@ 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)) {
+				if (parent_ce || (orig_ce->ce_flags & ZEND_ACC_LINKED)
+					|| ZSTR_LEN(early_binding->lc_parent_name) == 0) {
 					ce = zend_try_early_bind(orig_ce, parent_ce, early_binding->lcname, zv);
 				}
 			}