From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 9 Mar 2020 14:01:48 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2f7be721465fee1cdfd7d03f4a8234a931e6056;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79357
---

b2f7be721465fee1cdfd7d03f4a8234a931e6056
diff --cc Zend/zend_vm_def.h
index 5d8293dfd7,0282c3c584..168fa0de70
--- a/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 c8af9759c0,d79bdb1c1f..204619bd53
--- a/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;
  		}