Require types to be available for preloading

Author: nikic

ext/opcache/ZendAccelerator.c

@@ -3398,6 +3398,44 @@ static zend_bool preload_try_resolve_property_types(zend_class_entry *ce)
 	return ok;
 }
 
+static zend_bool preload_is_type_known(zend_class_entry *ce, zend_type type) {
+	zend_string *name, *lcname;
+	zend_bool known;
+	if (!ZEND_TYPE_IS_NAME(type)) {
+		return 1;
+	}
+
+	name = ZEND_TYPE_NAME(type);
+	if (zend_string_equals_literal_ci(name, "self") ||
+		zend_string_equals_literal_ci(name, "parent") ||
+		zend_string_equals_ci(name, ce->name)) {
+		return 1;
+	}
+
+	lcname = zend_string_tolower(name);
+	known = zend_hash_exists(EG(class_table), lcname);
+	zend_string_release(lcname);
+	return known;
+}
+
+static zend_bool preload_all_types_known(zend_class_entry *ce) {
+	zend_function *fptr;
+	ZEND_HASH_FOREACH_PTR(&ce->function_table, fptr) {
+		uint32_t i;
+		if (fptr->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
+			if (!preload_is_type_known(ce, fptr->common.arg_info[-1].type)) {
+				return 0;
+			}
+		}
+		for (i = 0; i < fptr->common.num_args; i++) {
+			if (!preload_is_type_known(ce, fptr->common.arg_info[i].type)) {
+				return 0;
+			}
+		}
+	} ZEND_HASH_FOREACH_END();
+	return 1;
+}
+
 static void preload_link(void)
 {
 	zval *zv;
@@ -3491,6 +3529,10 @@ static void preload_link(void)
 					if (!found) continue;
 				}
 
+				if (!preload_all_types_known(ce)) {
+					continue;
+				}
+
 				zend_string *key = zend_string_tolower(ce->name);
 				zv = zend_hash_set_bucket_key(EG(class_table), (Bucket*)zv, key);
 				zend_string_release(key);

ext/opcache/tests/preload_011.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Argument/return types must be available for preloading
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.preload={PWD}/preload_variance_ind.inc
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+interface K {}
+interface L extends K {}
+require __DIR__ . '/preload_variance.inc';
+
+$a = new A;
+$b = new B;
+$d = new D;
+$f = new F;
+$g = new G;
+
+?>
+===DONE===
+--EXPECTF--
+Warning: Can't preload unlinked class H in %s on line %d
+
+Warning: Can't preload unlinked class B in %s on line %d
+
+Warning: Can't preload unlinked class A in %s on line %d
+===DONE===

ext/opcache/tests/preload_variance.inc

@@ -0,0 +1,41 @@
+<?php
+
+// Requires X, delay to runtime.
+// TODO: It is not actually required, because we don't need X to check inheritance in this case.
+class A extends Z {
+    public function method(X $a) {}
+}
+class B extends Z {
+    public function method($a) : X {}
+}
+
+// Works.
+class C extends Z {
+    public function method($a): self {}
+    public function method2($a): C {}
+}
+class D extends C {
+    public function method($a): self {}
+    public function method2($a): D {}
+}
+
+// Works.
+interface I {}
+interface J extends I {}
+class E {
+    public function method($a): I {}
+}
+class F extends E {
+    public function method($a): J {}
+}
+
+// Requires K & L, delay to runtime.
+class G {
+    public function method($a): K {}
+}
+class H extends G {
+    public function method($a): L {}
+}
+
+// Early-binding preventer.
+class Z {}

ext/opcache/tests/preload_variance_ind.inc

@@ -0,0 +1,2 @@
+<?php
+opcache_compile_file(__DIR__ . '/preload_variance.inc');