Cleanup

Author: beberlei

Zend/zend_API.h

@@ -650,7 +650,6 @@ END_EXTERN_C()
 #define RETVAL_EMPTY_STRING() 			ZVAL_EMPTY_STRING(return_value)
 #define RETVAL_RES(r)			 		ZVAL_RES(return_value, r)
 #define RETVAL_ARR(r)			 		ZVAL_ARR(return_value, r)
-#define RETVAL_IMMUTABLE_ARR(r)			ZVAL_IMMUTABLE_ARR(return_value, r)
 #define RETVAL_EMPTY_ARRAY()			ZVAL_EMPTY_ARRAY(return_value)
 #define RETVAL_OBJ(r)			 		ZVAL_OBJ(return_value, r)
 #define RETVAL_COPY(zv)					ZVAL_COPY(return_value, zv)
@@ -672,7 +671,6 @@ END_EXTERN_C()
 #define RETURN_EMPTY_STRING() 			do { RETVAL_EMPTY_STRING(); return; } while (0)
 #define RETURN_RES(r) 					do { RETVAL_RES(r); return; } while (0)
 #define RETURN_ARR(r) 					do { RETVAL_ARR(r); return; } while (0)
-#define RETURN_IMMUTABLE_ARR(r) 		do { RETVAL_IMMUTABLE_ARR(r); return; } while (0)
 #define RETURN_EMPTY_ARRAY()			do { RETVAL_EMPTY_ARRAY(); return; } while (0)
 #define RETURN_OBJ(r) 					do { RETVAL_OBJ(r); return; } while (0)
 #define RETURN_COPY(zv)					do { RETVAL_COPY(zv); return; } while (0)

Zend/zend_types.h

@@ -681,8 +681,6 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
 #define IS_RESOURCE_EX				(IS_RESOURCE       | (IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT))
 #define IS_REFERENCE_EX				(IS_REFERENCE      | (IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT))
 
-#define IS_IMMUTABLE_ARRAY_EX		(IS_ARRAY          | !(IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT))
-
 #define IS_CONSTANT_AST_EX			(IS_CONSTANT_AST   | (IS_TYPE_REFCOUNTED << Z_TYPE_FLAGS_SHIFT))
 
 /* string flags (zval.value->gc.u.flags) */
@@ -941,12 +939,6 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
 		Z_TYPE_INFO_P(__z) = IS_ARRAY_EX;		\
 	} while (0)
 
-#define ZVAL_IMMUTABLE_ARR(z, a) do {				\
-		zval *__z = (z);							\
-		Z_ARR_P(__z) = (a);							\
-		Z_TYPE_INFO_P(__z) = IS_IMMUTABLE_ARRAY_EX;	\
-	} while (0)
-
 #define ZVAL_NEW_ARR(z) do {									\
 		zval *__z = (z);										\
 		zend_array *_arr =										\