Merge branch 'PHP-7.4'

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_execute.c
Simple merge

diff --cc Zend/zend_operators.c
Simple merge

diff --cc Zend/zend_vm_def.h
index e7915ab1d844d4490d743b59e41295de0a5c4fc6,649b07d36ebc27ed9fb389c327f0790d8335e55c..b1927d280cf8502e9405685844a7e84ecd9f3040
--- 1/Zend/zend_vm_def.h
--- 2/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 31951ba22f802515e1ba8b75ef974c1c375558b6,b4a59dff0e7278b5951242f68be5ae9767e6980e..3e01ae36b39642c263f4f8c0c6da1aadbf73a914
--- 1/Zend/zend_vm_execute.h
--- 2/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();
                }
        }