Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79357

diff --cc Zend/zend_vm_def.h
index 5d8293dfd7130699b300f3a30eecd26d2bee82f5,0282c3c584f616469f4ebe6ad2847fbfc4eafe96..168fa0de70c1700605d666a54df74a2dd13f47d8
--- 1/Zend/zend_vm_def.h
--- 2/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -8119,12 -8291,16 +8119,11 @@@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLI
  
                EG(current_execute_data) = call;
  
 -              if (UNEXPECTED(fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS)
 -               && UNEXPECTED(!zend_verify_internal_arg_types(fbc, call))) {
 -                      zend_vm_stack_free_call_frame(call);
 -                      if (ret) {
 -                              ZVAL_UNDEF(ret);
 -                      }
 -                      ZEND_VM_C_GOTO(call_trampoline_end);
 -              }
 +#if ZEND_DEBUG
 +              zend_bool should_throw = zend_internal_call_should_throw(fbc, call);
 +#endif
  
                if (ret == NULL) {
-                       ZVAL_NULL(&retval);
                        ret = &retval;
                }
  

diff --cc Zend/zend_vm_execute.h
index c8af9759c09787e85c3a19baa5d99f6b05690e57,d79bdb1c1f21ab6c68a723c73908769bd3f8e984..204619bd535b199fb88f70042fc04b2ee095fe81
--- 1/Zend/zend_vm_execute.h
--- 2/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -2762,12 -2796,16 +2762,11 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  
                EG(current_execute_data) = call;
  
 -              if (UNEXPECTED(fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS)
 -               && UNEXPECTED(!zend_verify_internal_arg_types(fbc, call))) {
 -                      zend_vm_stack_free_call_frame(call);
 -                      if (ret) {
 -                              ZVAL_UNDEF(ret);
 -                      }
 -                      goto call_trampoline_end;
 -              }
 +#if ZEND_DEBUG
 +              zend_bool should_throw = zend_internal_call_should_throw(fbc, call);
 +#endif
  
                if (ret == NULL) {
-                       ZVAL_NULL(&retval);
                        ret = &retval;
                }