Add type inference support for RECV_VARIADIC

diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index 669c88cc7a3f51d6d552ad7c64d591e903f87153..1ca381d9686645fb4614643158b1535051756c06 100644 (file)
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/ext/opcache/Optimizer/zend_inference.c
@@ -2996,6 +2996,7 @@ static zend_always_inline int _zend_update_type_info(
                        break;
                case ZEND_RECV:
                case ZEND_RECV_INIT:
+               case ZEND_RECV_VARIADIC:
                {
                        /* Typehinting */
                        zend_arg_info *arg_info = &op_array->arg_info[opline->op1.num-1];
@@ -3006,6 +3007,14 @@ static zend_always_inline int _zend_update_type_info(
                                tmp |= MAY_BE_REF;
                        }
 
+                       if (opline->opcode == ZEND_RECV_VARIADIC) {
+                               uint32_t elem_type = tmp & MAY_BE_REF
+                                       ? MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF
+                                       : (tmp & MAY_BE_ANY) << MAY_BE_ARRAY_SHIFT;
+                               tmp = MAY_BE_RC1|MAY_BE_RCN|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_ANY|elem_type;
+                               ce = NULL;
+                       }
+
                        UPDATE_SSA_TYPE(tmp, ssa_op->result_def);
                        if (ce) {
                                UPDATE_SSA_OBJ_TYPE(ce, 1, ssa_op->result_def);