Prevent inlining of method copied from trait

dstogov · dstogov · commit aea85c65bd17 · 2018-11-01T11:45:50.000+03:00
diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c
@@ -95,6 +95,8 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o
 {
 	if (func->type == ZEND_USER_FUNCTION
 	 && !(func->op_array.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_HAS_TYPE_HINTS))
+		/* TODO: function copied from trait may be inconsistent ??? */
+	 && !(func->op_array.fn_flags & (ZEND_ACC_TRAIT_CLONE))
 	 && fcall->extended_value >= func->op_array.required_num_args
 	 && func->op_array.opcodes[func->op_array.num_args].opcode == ZEND_RETURN) {
 

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ static void zend_try_inline_call(zend_op_array op_array, zend_op fcall, zend_o`
`95`	`95`	`{`
`96`	`96`	`if (func->type == ZEND_USER_FUNCTION`
`97`	`97`	`&& !(func->op_array.fn_flags & (ZEND_ACC_ABSTRACT\|ZEND_ACC_HAS_TYPE_HINTS))`
	`98`	`+ /* TODO: function copied from trait may be inconsistent ??? */`
	`99`	`+ && !(func->op_array.fn_flags & (ZEND_ACC_TRAIT_CLONE))`
`98`	`100`	`&& fcall->extended_value >= func->op_array.required_num_args`
`99`	`101`	`&& func->op_array.opcodes[func->op_array.num_args].opcode == ZEND_RETURN) {`
`100`	`102`