Fix GH-19548: remove ZEND_ACC_OVERRIDE on property inheritance only if it's not part of shared memory

[alexandre-daubois]

Fix #19548

[iluuu1994]

I think this can be fixed in a much simpler way. We can rely on the fact that an unmet inherited #[Override] property will have already errored when linking the parent. Hence, it's sufficient if we remove the ZEND_ACC_OVERRIDE flag only when the property belongs to the currently linked class.

diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index bbc7a767e1b..8679a53e8ff 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -1564,7 +1564,9 @@ static void do_inherit_property(zend_property_info *parent_info, zend_string *ke
 						ZSTR_VAL(parent_info->ce->name));
 			}
 
-			child_info->flags &= ~ZEND_ACC_OVERRIDE;
+			if (child_info->ce == ce) {
+				child_info->flags &= ~ZEND_ACC_OVERRIDE;
+			}
 		}
 	} else {
 		zend_function **hooks = parent_info->hooks;

[alexandre-daubois]

Oh right, It makes sense given where we are in the inheritance "lifecycle". Thanks, it works really well

[iluuu1994]

Same for the other test, but lgtm otherwise. Thanks!

[iluuu1994]

Should be moved to ext/opcache/tests, or this section should be removed entirely. Tests are ran with and without opcache, and opcache.protect_memory=1 is always enabled by run-tests.php.

[alexandre-daubois]

Ah yes of course, tests are cleaned up a bit now 👍

[iluuu1994]

Thank you @alexandre-daubois!