Add arg type assertions to DO_ICALL

Now that DO_ICALL is also used for functions with type hints, we
should include the arginfo sanity check assertions in there as
well.

Author: nikic

Zend/zend_vm_def.h

@@ -4010,13 +4010,23 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL))
 	call->prev_execute_data = execute_data;
 	EG(current_execute_data) = call;
 
+#if ZEND_DEBUG
+	/* Type checks for internal functions are usually only performed by zpp.
+	 * In debug mode we additionally run arginfo checks to detect cases where
+	 * arginfo and zpp went out of sync. */
+	zend_bool wrong_arg_types =
+		(fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) &&
+		!zend_verify_internal_arg_types(fbc, call);
+#endif
+
 	ret = RETURN_VALUE_USED(opline) ? EX_VAR(opline->result.var) : &retval;
 	ZVAL_NULL(ret);
 
 	fbc->internal_function.handler(call, ret);
 
 #if ZEND_DEBUG
 	if (!EG(exception) && call->func) {
+		ZEND_ASSERT(!wrong_arg_types && "Arginfo / zpp type mismatch?");
 		ZEND_ASSERT(!(call->func->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) ||
 			zend_verify_internal_return_type(call->func, ret));
 		ZEND_ASSERT((call->func->common.fn_flags & ZEND_ACC_RETURN_REFERENCE)
@@ -4101,7 +4111,6 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))
 		call->prev_execute_data = execute_data;
 		EG(current_execute_data) = call;
 
-
 #if ZEND_DEBUG
 		/* Type checks for internal functions are usually only performed by zpp.
 		 * In debug mode we additionally run arginfo checks to detect cases where

Zend/zend_vm_execute.h

@@ -1266,13 +1266,23 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETV
 	call->prev_execute_data = execute_data;
 	EG(current_execute_data) = call;
 
+#if ZEND_DEBUG
+	/* Type checks for internal functions are usually only performed by zpp.
+	 * In debug mode we additionally run arginfo checks to detect cases where
+	 * arginfo and zpp went out of sync. */
+	zend_bool wrong_arg_types =
+		(fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) &&
+		!zend_verify_internal_arg_types(fbc, call);
+#endif
+
 	ret = 0 ? EX_VAR(opline->result.var) : &retval;
 	ZVAL_NULL(ret);
 
 	fbc->internal_function.handler(call, ret);
 
 #if ZEND_DEBUG
 	if (!EG(exception) && call->func) {
+		ZEND_ASSERT(!wrong_arg_types && "Arginfo / zpp type mismatch?");
 		ZEND_ASSERT(!(call->func->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) ||
 			zend_verify_internal_return_type(call->func, ret));
 		ZEND_ASSERT((call->func->common.fn_flags & ZEND_ACC_RETURN_REFERENCE)
@@ -1311,13 +1321,23 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETV
 	call->prev_execute_data = execute_data;
 	EG(current_execute_data) = call;
 
+#if ZEND_DEBUG
+	/* Type checks for internal functions are usually only performed by zpp.
+	 * In debug mode we additionally run arginfo checks to detect cases where
+	 * arginfo and zpp went out of sync. */
+	zend_bool wrong_arg_types =
+		(fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) &&
+		!zend_verify_internal_arg_types(fbc, call);
+#endif
+
 	ret = 1 ? EX_VAR(opline->result.var) : &retval;
 	ZVAL_NULL(ret);
 
 	fbc->internal_function.handler(call, ret);
 
 #if ZEND_DEBUG
 	if (!EG(exception) && call->func) {
+		ZEND_ASSERT(!wrong_arg_types && "Arginfo / zpp type mismatch?");
 		ZEND_ASSERT(!(call->func->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) ||
 			zend_verify_internal_return_type(call->func, ret));
 		ZEND_ASSERT((call->func->common.fn_flags & ZEND_ACC_RETURN_REFERENCE)
@@ -1425,7 +1445,6 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 		call->prev_execute_data = execute_data;
 		EG(current_execute_data) = call;
 
-
 #if ZEND_DEBUG
 		/* Type checks for internal functions are usually only performed by zpp.
 		 * In debug mode we additionally run arginfo checks to detect cases where
@@ -1504,7 +1523,6 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 		call->prev_execute_data = execute_data;
 		EG(current_execute_data) = call;
 
-
 #if ZEND_DEBUG
 		/* Type checks for internal functions are usually only performed by zpp.
 		 * In debug mode we additionally run arginfo checks to detect cases where