Last active
July 20, 2021 11:19
-
-
Save dstogov/2bf90a232c83fbb47159cf855cad33ae to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c | |
index 797d83258c..a3ed78e410 100644 | |
--- a/ext/opcache/ZendAccelerator.c | |
+++ b/ext/opcache/ZendAccelerator.c | |
@@ -4086,6 +4086,7 @@ static void preload_link(void) | |
zend_op_array *op_array = &script->script.main_op_array; | |
zend_op *opline = op_array->opcodes; | |
zend_op *end = opline + op_array->last; | |
+ uint32_t skip_dynamic_func_count = 0; | |
while (opline != end) { | |
switch (opline->opcode) { | |
@@ -4096,6 +4097,40 @@ static void preload_link(void) | |
MAKE_NOP(opline); | |
} | |
break; | |
+ case ZEND_DECLARE_FUNCTION: | |
+ opline->op2.num -= skip_dynamic_func_count; | |
+ key = Z_STR_P(RT_CONSTANT(opline, opline->op1)); | |
+ zv = zend_hash_find(EG(function_table), key); | |
+ if (zv && Z_PTR_P(zv) == op_array->dynamic_func_defs[opline->op2.num]) { | |
+ zend_op_array **dynamic_func_defs; | |
+ | |
+ op_array->num_dynamic_func_defs--; | |
+ if (op_array->num_dynamic_func_defs == 0) { | |
+ dynamic_func_defs = NULL; | |
+ } else { | |
+ dynamic_func_defs = emalloc(sizeof(zend_op_array*) * op_array->num_dynamic_func_defs); | |
+ if (opline->op2.num > 0) { | |
+ memcpy( | |
+ dynamic_func_defs, | |
+ op_array->dynamic_func_defs, | |
+ sizeof(zend_op_array*) * opline->op2.num); | |
+ } | |
+ if (op_array->num_dynamic_func_defs - opline->op2.num > 0) { | |
+ memcpy( | |
+ dynamic_func_defs + opline->op2.num, | |
+ op_array->dynamic_func_defs + (opline->op2.num + 1), | |
+ sizeof(zend_op_array*) * (op_array->num_dynamic_func_defs - opline->op2.num)); | |
+ } | |
+ } | |
+ efree(op_array->dynamic_func_defs); | |
+ op_array->dynamic_func_defs = dynamic_func_defs; | |
+ skip_dynamic_func_count++; | |
+ MAKE_NOP(opline); | |
+ } | |
+ break; | |
+ case ZEND_DECLARE_LAMBDA_FUNCTION: | |
+ opline->op2.num -= skip_dynamic_func_count; | |
+ break; | |
} | |
opline++; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment