Fix preloading of trait property attributes

php · Jul 27, 2021 · 1bd6faf · 1bd6faf
1 parent 5a7e1a7
commit 1bd6faf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ext/opcache/tests/preload.inc b/ext/opcache/tests/preload.inc
@@ -24,6 +24,9 @@ class x extends c implements a, b {
 }
 
 trait T1 {
+    #[A]
+    public $prop;
+
     static function foo() {
         var_dump(__METHOD__);
     }

diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -266,6 +266,12 @@ static HashTable *zend_persist_attributes(HashTable *attributes)
 		return attributes;
 	}
 
+	/* Attributes for trait properties may be shared if preloading is used. */
+	HashTable *xlat = zend_shared_alloc_get_xlat_entry(attributes);
+	if (xlat) {
+		return xlat;
+	}
+
 	zend_hash_persist(attributes);
 
 	ZEND_HASH_FOREACH_VAL(attributes, v) {