@@ -944,16 +944,6 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
944944#define Z_COLLECTABLE (zval ) ((Z_TYPE_FLAGS(zval) & IS_TYPE_COLLECTABLE) != 0)
945945#define Z_COLLECTABLE_P (zval_p ) Z_COLLECTABLE(*(zval_p))
946946
947- /* deprecated: (COPYABLE is the same as IS_ARRAY) */
948- #define Z_COPYABLE (zval ) (Z_TYPE(zval) == IS_ARRAY)
949- #define Z_COPYABLE_P (zval_p ) Z_COPYABLE(*(zval_p))
950-
951- /* deprecated: (IMMUTABLE is the same as IS_ARRAY && !REFCOUNTED) */
952- #define Z_IMMUTABLE (zval ) (Z_TYPE_INFO(zval) == IS_ARRAY)
953- #define Z_IMMUTABLE_P (zval_p ) Z_IMMUTABLE(*(zval_p))
954- #define Z_OPT_IMMUTABLE (zval ) Z_IMMUTABLE(zval_p)
955- #define Z_OPT_IMMUTABLE_P (zval_p ) Z_IMMUTABLE(*(zval_p))
956-
957947/* the following Z_OPT_* macros make better code when Z_TYPE_INFO accessed before */
958948#define Z_OPT_TYPE (zval ) (Z_TYPE_INFO(zval) & Z_TYPE_MASK)
959949#define Z_OPT_TYPE_P (zval_p ) Z_OPT_TYPE(*(zval_p))
@@ -967,10 +957,6 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
967957#define Z_OPT_COLLECTABLE (zval ) ((Z_TYPE_INFO(zval) & (IS_TYPE_COLLECTABLE << Z_TYPE_FLAGS_SHIFT)) != 0)
968958#define Z_OPT_COLLECTABLE_P (zval_p ) Z_OPT_COLLECTABLE(*(zval_p))
969959
970- /* deprecated: (COPYABLE is the same as IS_ARRAY) */
971- #define Z_OPT_COPYABLE (zval ) (Z_OPT_TYPE(zval) == IS_ARRAY)
972- #define Z_OPT_COPYABLE_P (zval_p ) Z_OPT_COPYABLE(*(zval_p))
973-
974960#define Z_OPT_ISREF (zval ) (Z_OPT_TYPE(zval) == IS_REFERENCE)
975961#define Z_OPT_ISREF_P (zval_p ) Z_OPT_ISREF(*(zval_p))
976962
0 commit comments