Bump ce_flags size

Author: iluuu1994

Zend/Optimizer/escape_analysis.c

@@ -160,7 +160,7 @@ static bool is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, i
 			    /* objects with destructors should escape */
 				zend_class_entry *ce = zend_optimizer_get_class_entry_from_op1(
 					script, op_array, opline);
-				uint32_t forbidden_flags =
+				zend_ce_flags forbidden_flags =
 					/* These flags will always cause an exception */
 					ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS
 					| ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT;

Zend/zend.h

@@ -112,10 +112,12 @@ typedef struct _zend_trait_alias {
 	uint32_t modifiers;
 } zend_trait_alias;
 
+typedef uint64_t zend_ce_flags;
+
 typedef struct _zend_class_mutable_data {
 	zval      *default_properties_table;
 	HashTable *constants_table;
-	uint32_t   ce_flags;
+	zend_ce_flags ce_flags;
 	HashTable *backed_enum_table;
 } zend_class_mutable_data;
 
@@ -152,8 +154,8 @@ struct _zend_class_entry {
 		zend_class_entry *parent;
 		zend_string *parent_name;
 	};
+	zend_ce_flags ce_flags;
 	int refcount;
-	uint32_t ce_flags;
 
 	int default_properties_count;
 	int default_static_members_count;

Zend/zend_API.c

@@ -1495,7 +1495,7 @@ ZEND_API zend_result zend_update_class_constants(zend_class_entry *class_type) /
 	zval *static_members_table = NULL;
 	zend_class_constant *c;
 	zval *val;
-	uint32_t ce_flags;
+	zend_ce_flags ce_flags;
 
 	ce_flags = class_type->ce_flags;
 

Zend/zend_ast.h

@@ -207,7 +207,7 @@ typedef struct _zend_ast_decl {
 	zend_ast_attr attr; /* Unused - for structure compatibility */
 	uint32_t start_lineno;
 	uint32_t end_lineno;
-	uint32_t flags;
+	uint64_t flags;
 	zend_string *doc_comment;
 	zend_string *name;
 	zend_ast *child[5];

Zend/zend_builtin_functions.c

@@ -1002,7 +1002,7 @@ flf_clean:;
 	Z_FLF_PARAM_FREE_STR(2, property_tmp)
 }
 
-static inline void _class_exists_impl(zval *return_value, zend_string *name, bool autoload, int flags, int skip_flags) /* {{{ */
+static inline void _class_exists_impl(zval *return_value, zend_string *name, bool autoload, zend_ce_flags flags, zend_ce_flags skip_flags) /* {{{ */
 {
 	zend_string *lcname;
 	zend_class_entry *ce;
@@ -1037,7 +1037,7 @@ static inline void _class_exists_impl(zval *return_value, zend_string *name, boo
 }
 /* {{{ */
 
-static inline void class_exists_impl(INTERNAL_FUNCTION_PARAMETERS, int flags, int skip_flags) /* {{{ */
+static inline void class_exists_impl(INTERNAL_FUNCTION_PARAMETERS, zend_ce_flags flags, zend_ce_flags skip_flags) /* {{{ */
 {
 	zend_string *name;
 	bool autoload = true;

Zend/zend_inheritance.c

@@ -3011,7 +3011,7 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 	zend_class_entry **traits_and_interfaces = NULL;
 	zend_class_entry *proto = NULL;
 	zend_class_entry *orig_linking_class;
-	uint32_t is_cacheable = ce->ce_flags & ZEND_ACC_IMMUTABLE;
+	zend_ce_flags is_cacheable = ce->ce_flags & ZEND_ACC_IMMUTABLE;
 	uint32_t i, j;
 	zval *zv;
 	ALLOCA_FLAG(use_heap)
@@ -3355,7 +3355,7 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
 		return ce;
 	}
 
-	uint32_t is_cacheable = ce->ce_flags & ZEND_ACC_IMMUTABLE;
+	zend_ce_flags is_cacheable = ce->ce_flags & ZEND_ACC_IMMUTABLE;
 	UPDATE_IS_CACHEABLE(parent_ce);
 	if (is_cacheable) {
 		if (zend_inheritance_cache_get && zend_inheritance_cache_add) {

ext/opcache/ZendAccelerator.c

@@ -3916,7 +3916,7 @@ static void preload_link(void)
 			 * prevent freeing of interface names. */
 			void *checkpoint = zend_arena_checkpoint(CG(arena));
 			zend_class_entry *orig_ce = ce;
-			uint32_t temporary_flags = ZEND_ACC_FILE_CACHED|ZEND_ACC_CACHED;
+			zend_ce_flags temporary_flags = ZEND_ACC_FILE_CACHED|ZEND_ACC_CACHED;
 			ce->ce_flags |= temporary_flags;
 			if (ce->parent_name) {
 				zend_string_addref(ce->parent_name);