Merge branch 'PHP-7.4'

dstogov · dstogov · commit d6a8a5ac6456 · 2019-08-05T22:56:03.000+03:00
* PHP-7.4:
  Fixed bug #78376 (Incorrect preloading of constant static properties)
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4322,6 +4322,16 @@ static int accel_preload(const char *config)
 			ZEND_ASSERT(ce->ce_flags & ZEND_ACC_PRELOADED);
 			if (ce->default_static_members_count) {
 				zend_cleanup_internal_class_data(ce);
+				if (ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED) {
+					int i;
+
+					for (i = 0; i < ce->default_static_members_count; i++) {
+						if (Z_TYPE(ce->default_static_members_table[i]) == IS_CONSTANT_AST) {
+							ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
+							break;
+						}
+					}
+				}
 			}
 			if (ce->ce_flags & ZEND_HAS_STATIC_IN_METHODS) {
 				zend_op_array *op_array;
diff --git a/ext/opcache/tests/bug78376.phpt b/ext/opcache/tests/bug78376.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #78376 (Incorrect preloading of constant static properties)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.preload={PWD}/preload_bug78376.inc
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+var_dump(\A::$a);
+?>
+--EXPECT--
+string(4) "aaaa"
diff --git a/ext/opcache/tests/preload_bug78376.inc b/ext/opcache/tests/preload_bug78376.inc
@@ -0,0 +1,6 @@
+<?php
+const CNST = 'aaaa';
+class A {
+	public static $a = CNST;
+}
+$a = \A::$a;
