Fixed unintended disabling of Optimizer for preloaded scripts introduced by 4a2646c

dstogov · dstogov · commit 3928b6b435f6 · 2020-09-29T12:11:01.000+03:00
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4078,6 +4078,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();
 
@@ -4087,8 +4088,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
`@@ -4078,6 +4078,7 @@ static void preload_fix_trait_methods(zend_class_entry *ce)`
`4078`	`4078`	`static int preload_optimize(zend_persistent_script *script)`
`4079`	`4079`	`{`
`4080`	`4080`	`zend_class_entry *ce;`
	`4081`	`+ zend_persistent_script *tmp_script;`
`4081`	`4082`
`4082`	`4083`	`zend_shared_alloc_init_xlat_table();`
`4083`	`4084`
`@@ -4087,8 +4088,8 @@ static int preload_optimize(zend_persistent_script *script)`
`4087`	`4088`	`}`
`4088`	`4089`	`} ZEND_HASH_FOREACH_END();`
`4089`	`4090`
`4090`		`- ZEND_HASH_FOREACH_PTR(preload_scripts, script) {`
`4091`		`- ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) {`
	`4091`	`+ ZEND_HASH_FOREACH_PTR(preload_scripts, tmp_script) {`
	`4092`	`+ ZEND_HASH_FOREACH_PTR(&tmp_script->script.class_table, ce) {`
`4092`	`4093`	`if (ce->ce_flags & ZEND_ACC_TRAIT) {`
`4093`	`4094`	`preload_register_trait_methods(ce);`
`4094`	`4095`	`}`