Merge branch 'PHP-7.4'

* PHP-7.4:
  Addirional fix for bug #78918

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_types.h
index 3ff94eb574c27a6180803dd7a27c7f0635230ee2,7b8c079c458d78aadbb0034d6b482b1d5570c1ec..e32538591b656aba95655a049c65337655cbf021
--- 1/Zend/zend_types.h
--- 2/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@@ -531,21 -420,22 +531,22 @@@ struct _zend_ast_ref 
  #define IS_OBJECT                                     8
  #define IS_RESOURCE                                   9
  #define IS_REFERENCE                          10
 +#define IS_CONSTANT_AST                               11 /* Constant expressions */
  
 -/* constant expressions */
 -#define IS_CONSTANT_AST                               11
 +/* Fake types used only for type hinting. IS_VOID should be the last. */
 +#define IS_CALLABLE                                   12
 +#define IS_ITERABLE                                   13
 +#define IS_VOID                                               14
  
  /* internal types */
 -#define IS_INDIRECT                   13
 -#define IS_PTR                                                14
 -#define IS_ALIAS_PTR                          15
 -#define _IS_ERROR                                     15
 -
 -/* fake types used only for type hinting (Z_TYPE(zv) can not use them) */
 -#define _IS_BOOL                                      16
 -#define IS_CALLABLE                                   17
 -#define IS_ITERABLE                                   18
 -#define IS_VOID                                               19
 -#define _IS_NUMBER                                    20
 +#define IS_INDIRECT                   15
 +#define IS_PTR                                                16
++#define IS_ALIAS_PTR                          17
 +#define _IS_ERROR                                     17
 +
 +/* used for casts */
 +#define _IS_BOOL                                      18
 +#define _IS_NUMBER                                    19
  
  static zend_always_inline zend_uchar zval_get_type(const zval* pz) {
        return pz->u1.v.type;

diff --cc ext/opcache/ZendAccelerator.c
Simple merge

diff --cc ext/opcache/zend_persist.c
Simple merge