Merge branch 'PHP-7.4'

dstogov · dstogov · commit 8d9da8df28e2 · 2020-09-29T12:13:17.000+03:00
* PHP-7.4: Fixed unintended disabling of Optimizer for preloaded scripts introduced by 4a2646c
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4160,6 +4160,7 @@ static void preload_fix_trait_methods(zend_class_entry *ce)
 static int preload_optimize(zend_persistent_script *script)
 {
 	zend_class_entry *ce;
+	zend_persistent_script *tmp_script;
 
 	zend_shared_alloc_init_xlat_table();
 
@@ -4169,8 +4170,8 @@ static int preload_optimize(zend_persistent_script *script)
 		}
 	} ZEND_HASH_FOREACH_END();
 
-	ZEND_HASH_FOREACH_PTR(preload_scripts, script) {
-		ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) {
+	ZEND_HASH_FOREACH_PTR(preload_scripts, tmp_script) {
+		ZEND_HASH_FOREACH_PTR(&tmp_script->script.class_table, ce) {
 			if (ce->ce_flags & ZEND_ACC_TRAIT) {
 				preload_register_trait_methods(ce);
 			}

Original file line number	Diff line number	Diff line change
`@@ -4160,6 +4160,7 @@ static void preload_fix_trait_methods(zend_class_entry *ce)`
`4160`	`4160`	`static int preload_optimize(zend_persistent_script *script)`
`4161`	`4161`	`{`
`4162`	`4162`	`zend_class_entry *ce;`
	`4163`	`+ zend_persistent_script *tmp_script;`
`4163`	`4164`
`4164`	`4165`	`zend_shared_alloc_init_xlat_table();`
`4165`	`4166`
`@@ -4169,8 +4170,8 @@ static int preload_optimize(zend_persistent_script *script)`
`4169`	`4170`	`}`
`4170`	`4171`	`} ZEND_HASH_FOREACH_END();`
`4171`	`4172`
`4172`		`- ZEND_HASH_FOREACH_PTR(preload_scripts, script) {`
`4173`		`- ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) {`
	`4173`	`+ ZEND_HASH_FOREACH_PTR(preload_scripts, tmp_script) {`
	`4174`	`+ ZEND_HASH_FOREACH_PTR(&tmp_script->script.class_table, ce) {`
`4174`	`4175`	`if (ce->ce_flags & ZEND_ACC_TRAIT) {`
`4175`	`4176`	`preload_register_trait_methods(ce);`
`4176`	`4177`	`}`