com php-src: Remove unused IS_TYPE_SYMBOLTABLE: Zend/ze nd.c Zend/zend_types.h

Commit: 3ed5e54a19ac1990583b269334195a93ac90154e Author: Xinchen Hui <laruence@gmail.com> Wed, 16 Dec 2015 12:11:55 +0800 Parents: 9044f491cc0263aa8a8d4537beda43d0d832c94d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3ed5e54a19ac1990583b269334195a93ac90154e Log: Remove unused IS_TYPE_SYMBOLTABLE Changed paths: M Zend/zend.c M Zend/zend_types.h Diff: diff --git a/Zend/zend.c b/Zend/zend.c index ec520b8..6696e7b 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -622,7 +622,7 @@ static zend_bool php_auto_globals_create_globals(zend_string *name) /* {{{ */ zval globals; ZVAL_ARR(&globals, &EG(symbol_table)); - Z_TYPE_INFO_P(&globals) = IS_ARRAY | (IS_TYPE_SYMBOLTABLE << Z_TYPE_FLAGS_SHIFT); + Z_TYPE_INFO_P(&globals) = IS_ARRAY; ZVAL_NEW_REF(&globals, &globals); zend_hash_update(&EG(symbol_table), name, &globals); return 0; diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 4155f75..6536061 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -397,7 +397,6 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define IS_TYPE_REFCOUNTED (1<<2) #define IS_TYPE_COLLECTABLE (1<<3) #define IS_TYPE_COPYABLE (1<<4) -#define IS_TYPE_SYMBOLTABLE (1<<5) /* extended types */ #define IS_INTERNED_STRING_EX IS_STRING @@ -474,9 +473,6 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define Z_IMMUTABLE(zval) ((Z_TYPE_FLAGS(zval) & IS_TYPE_IMMUTABLE) != 0) #define Z_IMMUTABLE_P(zval_p) Z_IMMUTABLE(*(zval_p)) -#define Z_SYMBOLTABLE(zval) ((Z_TYPE_FLAGS(zval) & IS_TYPE_SYMBOLTABLE) != 0) -#define Z_SYMBOLTABLE_P(zval_p) Z_SYMBOLTABLE(*(zval_p)) - /* the following Z_OPT_* macros make better code when Z_TYPE_INFO accessed before */ #define Z_OPT_TYPE(zval) (Z_TYPE_INFO(zval) & Z_TYPE_MASK) #define Z_OPT_TYPE_P(zval_p) Z_OPT_TYPE(*(zval_p)) @@ -813,7 +809,7 @@ static zend_always_inline zend_uchar zval_get_type(const zval* pz) { #define Z_TRY_DELREF(z) Z_TRY_DELREF_P(&(z)) static zend_always_inline uint32_t zval_refcount_p(zval* pz) { - ZEND_ASSERT(Z_REFCOUNTED_P(pz) || Z_IMMUTABLE_P(pz) || Z_SYMBOLTABLE_P(pz)); + ZEND_ASSERT(Z_REFCOUNTED_P(pz) || Z_IMMUTABLE_P(pz)); return GC_REFCOUNT(Z_COUNTED_P(pz)); }