fix(opcache): preserve substituted arg_info on inherited methods

Signed-off-by: azjezz <azjezz@protonmail.com>

Author: azjezz

Zend/Optimizer/zend_optimizer.c

@@ -1734,12 +1734,17 @@ ZEND_API void zend_optimize_script(zend_script *script, zend_long optimization_l
 					uint32_t fn_flags2 = op_array->fn_flags2;
 					zend_function *prototype = op_array->prototype;
 					HashTable *ht = op_array->static_variables;
+					zend_arg_info *arg_info = op_array->arg_info;
+					bool arg_info_substituted = (arg_info != orig_op_array->arg_info);
 
 					*op_array = *orig_op_array;
 					op_array->fn_flags = fn_flags;
 					op_array->fn_flags2 = fn_flags2;
 					op_array->prototype = prototype;
 					op_array->static_variables = ht;
+					if (arg_info_substituted) {
+						op_array->arg_info = arg_info;
+					}
 				}
 			}
 		} ZEND_HASH_FOREACH_END();

ext/opcache/zend_persist.c

@@ -586,8 +586,31 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
 				if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
 					arg_info--;
 				}
-				arg_info = zend_shared_alloc_get_xlat_entry(arg_info);
-				ZEND_ASSERT(arg_info != NULL);
+				zend_arg_info *xlat_arg_info = zend_shared_alloc_get_xlat_entry(arg_info);
+				if (xlat_arg_info) {
+					arg_info = xlat_arg_info;
+				} else {
+					uint32_t num_args = op_array->num_args;
+					if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
+						num_args++;
+					}
+
+					if (op_array->fn_flags & ZEND_ACC_VARIADIC) {
+						num_args++;
+					}
+
+					arg_info = zend_shared_memdup_put(arg_info, sizeof(zend_arg_info) * num_args);
+					for (uint32_t i = 0; i < num_args; i++) {
+						if (arg_info[i].name) {
+							zend_accel_store_interned_string(arg_info[i].name);
+						}
+
+						zend_persist_type(&arg_info[i].type);
+						if (arg_info[i].doc_comment) {
+							zend_accel_store_interned_string(arg_info[i].doc_comment);
+						}
+					}
+				}
 				if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
 					arg_info++;
 				}

ext/opcache/zend_persist_calc.c

@@ -343,6 +343,36 @@ static void zend_persist_op_array_calc_ex(zend_op_array *op_array)
 		if (zend_shared_alloc_get_xlat_entry(op_array->opcodes)) {
 			/* already stored */
 			ADD_SIZE(ZEND_ALIGNED_SIZE(zend_extensions_op_array_persist_calc(op_array)));
+			if (op_array->arg_info) {
+				zend_arg_info *arg_info = op_array->arg_info;
+				if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
+					arg_info--;
+				}
+
+				if (!zend_shared_alloc_get_xlat_entry(arg_info)) {
+					uint32_t num_args = op_array->num_args;
+					if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
+						num_args++;
+					}
+
+					if (op_array->fn_flags & ZEND_ACC_VARIADIC) {
+						num_args++;
+					}
+
+					ADD_SIZE(sizeof(zend_arg_info) * num_args);
+					for (uint32_t i = 0; i < num_args; i++) {
+						if (arg_info[i].name) {
+							ADD_INTERNED_STRING(arg_info[i].name);
+						}
+
+						zend_persist_type_calc(&arg_info[i].type);
+						if (arg_info[i].doc_comment) {
+							ADD_INTERNED_STRING(arg_info[i].doc_comment);
+						}
+					}
+				}
+			}
+
 			return;
 		}
 	}