Keep information about SEND_UNPACK/SEND_ARRAY in call_info

Author: dstogov

ext/opcache/Optimizer/sccp.c

@@ -1841,7 +1841,7 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
 			}
 
 			/* We're only interested in functions with up to three arguments right now */
-			if (call->num_args > 3) {
+			if (call->num_args > 3 || call->send_unpack) {
 				SET_RESULT_BOT(result);
 				break;
 			}

ext/opcache/Optimizer/zend_call_graph.c

@@ -136,9 +136,8 @@ int zend_analyze_calls(zend_arena **arena, zend_script *script, uint32_t build_f
 				break;
 			case ZEND_SEND_ARRAY:
 			case ZEND_SEND_UNPACK:
-				/* TODO: set info about var_arg call ??? */
 				if (call_info) {
-					call_info->num_args = -1;
+					call_info->send_unpack = 1;
 				}
 				break;
 			case ZEND_EXIT:

ext/opcache/Optimizer/zend_call_graph.h

@@ -40,7 +40,8 @@ struct _zend_call_info {
 	zend_call_info         *next_caller;
 	zend_call_info         *next_callee;
 	zend_func_info         *clone;
-	int                     recursive;
+	zend_bool               recursive;
+	zend_bool               send_unpack;  /* Parameters passed by SEND_UNPACK or SEND_ARRAY */
 	int                     num_args;
 	zend_send_arg_info      arg_info[1];
 };

ext/opcache/Optimizer/zend_func_info.c

@@ -54,7 +54,8 @@ typedef struct _func_info_t {
 
 static uint32_t zend_range_info(const zend_call_info *call_info, const zend_ssa *ssa)
 {
-	if (call_info->num_args == 2 || call_info->num_args == 3) {
+	if (!call_info->send_unpack
+	 && (call_info->num_args == 2 || call_info->num_args == 3)) {
 		zend_op_array *op_array = call_info->caller_op_array;
 		uint32_t t1 = _ssa_op1_info(op_array, ssa, call_info->arg_info[0].opline,
 			&ssa->ops[call_info->arg_info[0].opline - op_array->opcodes]);