From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 11 Dec 2019 09:29:10 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee45dbab377ef733abfea937f5e8356d6f8c209b;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Addirional fix for bug #78918
---

ee45dbab377ef733abfea937f5e8356d6f8c209b
diff --cc Zend/zend_types.h
index 3ff94eb574,7b8c079c45..e32538591b
--- a/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;