From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 8 Oct 2019 15:19:52 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c1bc91e527cc64341ff581703be35b2391139ad;p=php

Merge branch 'PHP-7.4'
---

7c1bc91e527cc64341ff581703be35b2391139ad
diff --cc Zend/zend_vm_def.h
index e7915ab1d8,649b07d36e..b1927d280c
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -5075,7 -5209,7 +5075,7 @@@ ZEND_VM_HOT_HANDLER(63, ZEND_RECV, NUM
  		zval *param = EX_VAR(opline->result.var);
  
  		SAVE_OPLINE();
- 		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)) || EG(exception))) {
 -		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, NULL, CACHE_ADDR(opline->op2.num)))) {
++		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)))) {
  			HANDLE_EXCEPTION();
  		}
  	}
@@@ -5120,8 -5254,10 +5120,8 @@@ ZEND_VM_HOT_HANDLER(64, ZEND_RECV_INIT
  	}
  
  	if (UNEXPECTED((EX(func)->op_array.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) != 0)) {
 -		zval *default_value = RT_CONSTANT(opline, opline->op2);
 -
  		SAVE_OPLINE();
- 		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)) || EG(exception))) {
 -		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, default_value, CACHE_ADDR(opline->extended_value)))) {
++		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)))) {
  			HANDLE_EXCEPTION();
  		}
  	}
diff --cc Zend/zend_vm_execute.h
index 31951ba22f,b4a59dff0e..3e01ae36b3
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -2976,8 -3057,10 +2976,8 @@@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_
  	}
  
  	if (UNEXPECTED((EX(func)->op_array.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) != 0)) {
 -		zval *default_value = RT_CONSTANT(opline, opline->op2);
 -
  		SAVE_OPLINE();
- 		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)) || EG(exception))) {
 -		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, default_value, CACHE_ADDR(opline->extended_value)))) {
++		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)))) {
  			HANDLE_EXCEPTION();
  		}
  	}
@@@ -3055,7 -3139,7 +3055,7 @@@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_
  		zval *param = EX_VAR(opline->result.var);
  
  		SAVE_OPLINE();
- 		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)) || EG(exception))) {
 -		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, NULL, CACHE_ADDR(opline->op2.num)))) {
++		if (UNEXPECTED(!zend_verify_recv_arg_type(EX(func), arg_num, param, CACHE_ADDR(opline->extended_value)))) {
  			HANDLE_EXCEPTION();
  		}
  	}