Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit d282345e1157 · 2022-10-17T11:27:12.000+03:00
* PHP-8.1:
  Reset JIT for dynamic functions on opcache restrart
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -5137,6 +5137,11 @@ static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)
 		}
 #endif
 	}
+	if (op_array->num_dynamic_func_defs) {
+		for (uint32_t i = 0; i < op_array->num_dynamic_func_defs; i++) {
+			zend_jit_restart_preloaded_op_array(op_array->dynamic_func_defs[i]);
+		}
+	}
 }
 
 static void zend_jit_restart_preloaded_script(zend_persistent_script *script)

Original file line number	Diff line number	Diff line change
`@@ -5137,6 +5137,11 @@ static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)`
`5137`	`5137`	`}`
`5138`	`5138`	`#endif`
`5139`	`5139`	`}`
	`5140`	`+ if (op_array->num_dynamic_func_defs) {`
	`5141`	`+ for (uint32_t i = 0; i < op_array->num_dynamic_func_defs; i++) {`
	`5142`	`+ zend_jit_restart_preloaded_op_array(op_array->dynamic_func_defs[i]);`
	`5143`	`+ }`
	`5144`	`+ }`
`5140`	`5145`	`}`
`5141`	`5146`
`5142`	`5147`	`static void zend_jit_restart_preloaded_script(zend_persistent_script *script)`