Don't print preload warning for non-top-level classes

nikic · nikic · commit b1b0c81e397c · 2021-07-30T10:27:51.000+02:00
Dynamically declared classes categorically do not get linked during
preloading, even if all their dependencies are known. The warning
is misleading in this case, and there isn't anything the user can
do to address it.
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4034,7 +4034,8 @@ static void preload_link(void)
 		if (ce->type == ZEND_INTERNAL_CLASS) {
 			break;
 		}
-		if (!(ce->ce_flags & ZEND_ACC_LINKED)) {
+		if ((ce->ce_flags & (ZEND_ACC_TOP_LEVEL|ZEND_ACC_ANON_CLASS))
+				&& !(ce->ce_flags & ZEND_ACC_LINKED)) {
 			zend_string *key = zend_string_tolower(ce->name);
 			if (!(ce->ce_flags & ZEND_ACC_ANON_CLASS)
 			 && zend_hash_exists(EG(class_table), key)) {
diff --git a/ext/opcache/tests/bug78937_1.phpt b/ext/opcache/tests/bug78937_1.phpt
@@ -18,8 +18,6 @@ class Bar {
 var_dump(foo());
 ?>
 --EXPECTF--
-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6
-
 Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3
 object(Bar@anonymous)#%d (0) {
 }
diff --git a/ext/opcache/tests/bug78937_2.phpt b/ext/opcache/tests/bug78937_2.phpt
@@ -19,8 +19,6 @@ class Bar {
 var_dump(foo());
 ?>
 --EXPECTF--
-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6
-
 Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3
 object(Bar@anonymous)#%d (0) {
 }
diff --git a/ext/opcache/tests/bug78937_3.phpt b/ext/opcache/tests/bug78937_3.phpt
@@ -17,8 +17,6 @@ include(__DIR__ . "/preload_bug78937.inc");
 var_dump(foo());
 ?>
 --EXPECTF--
-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6
-
 Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3
 
 Fatal error: Uncaught Error: Class "Bar" not found in %spreload_bug78937.inc:3
diff --git a/ext/opcache/tests/bug78937_4.phpt b/ext/opcache/tests/bug78937_4.phpt
@@ -19,8 +19,6 @@ bar();
 var_dump(new Foo);
 ?>
 --EXPECTF--
-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6
-
 Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3
 object(Foo)#%d (0) {
 }
diff --git a/ext/opcache/tests/bug78937_5.phpt b/ext/opcache/tests/bug78937_5.phpt
@@ -20,8 +20,6 @@ bar();
 var_dump(new Foo);
 ?>
 --EXPECTF--
-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6
-
 Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3
 object(Foo)#%d (0) {
 }
diff --git a/ext/opcache/tests/bug78937_6.phpt b/ext/opcache/tests/bug78937_6.phpt
@@ -18,8 +18,6 @@ bar();
 var_dump(new Foo);
 ?>
 --EXPECTF--
-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6
-
 Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3
 
 Fatal error: Uncaught Error: Class "Bar" not found in %spreload_bug78937.inc:6
diff --git a/ext/opcache/tests/preload_enum.phpt b/ext/opcache/tests/preload_enum.phpt
@@ -17,9 +17,7 @@ var_dump(MyEnum::Foo);
 var_dump(MyEnum::Bar);
 
 ?>
---EXPECTF--
+--EXPECT--
 enum(MyEnum::Bar)
-
-Warning: Can't preload unlinked class MyEnum2: Unknown reason in %s on line %d
 enum(MyEnum::Foo)
 enum(MyEnum::Bar)

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ class Bar {`
`18`	`18`	`var_dump(foo());`
`19`	`19`	`?>`
`20`	`20`	`--EXPECTF--`
`21`		`-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6`
`22`		`-`
`23`	`21`	`Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3`
`24`	`22`	`object(Bar@anonymous)#%d (0) {`
`25`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ class Bar {`
`19`	`19`	`var_dump(foo());`
`20`	`20`	`?>`
`21`	`21`	`--EXPECTF--`
`22`		`-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6`
`23`		`-`
`24`	`22`	`Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3`
`25`	`23`	`object(Bar@anonymous)#%d (0) {`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ bar();`
`19`	`19`	`var_dump(new Foo);`
`20`	`20`	`?>`
`21`	`21`	`--EXPECTF--`
`22`		`-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6`
`23`		`-`
`24`	`22`	`Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3`
`25`	`23`	`object(Foo)#%d (0) {`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ bar();`
`20`	`20`	`var_dump(new Foo);`
`21`	`21`	`?>`
`22`	`22`	`--EXPECTF--`
`23`		`-Warning: Can't preload unlinked class Foo: Unknown parent Bar in %spreload_bug78937.inc on line 6`
`24`		`-`
`25`	`23`	`Warning: Can't preload unlinked class Bar@anonymous: Unknown parent Bar in %spreload_bug78937.inc on line 3`
`26`	`24`	`object(Foo)#%d (0) {`
`27`	`25`	`}`