Use 2 bytes for constant flags, set class constant module number

Author: DanielEScherzer

Zend/zend_API.c

@@ -4884,7 +4884,13 @@ ZEND_API zend_class_constant *zend_declare_typed_class_constant(zend_class_entry
 		c = zend_arena_alloc(&CG(arena), sizeof(zend_class_constant));
 	}
 	ZVAL_COPY_VALUE(&c->value, value);
-	ZEND_CLASS_CONST_FLAGS(c) = flags;
+
+	int module_number = PHP_USER_CONSTANT;
+	if (ce->type == ZEND_INTERNAL_CLASS) {
+		module_number = ce->info.internal.module->module_number;
+	}
+	ZEND_CONSTANT_SET_FLAGS(c, flags, module_number);
+
 	c->doc_comment = doc_comment;
 	c->attributes = NULL;
 	c->ce = ce;

Zend/zend_constants.h

@@ -45,22 +45,22 @@
 		} \
 	} while (0)
 
-#define	PHP_USER_CONSTANT   0x7fffff /* a constant defined in user space */
+#define	PHP_USER_CONSTANT   0x7fff /* a constant defined in user space */
 
 typedef struct _zend_constant {
 	zval value;
 	zend_string *name;
 } zend_constant;
 
 #define ZEND_CONSTANT_FLAGS(c) \
-	(Z_CONSTANT_FLAGS((c)->value) & 0xff)
+	(Z_CONSTANT_FLAGS((c)->value) & 0xffff)
 
 #define ZEND_CONSTANT_MODULE_NUMBER(c) \
-	(Z_CONSTANT_FLAGS((c)->value) >> 8)
+	(Z_CONSTANT_FLAGS((c)->value) >> 16)
 
 #define ZEND_CONSTANT_SET_FLAGS(c, _flags, _module_number) do { \
 		Z_CONSTANT_FLAGS((c)->value) = \
-			((_flags) & 0xff) | ((_module_number) << 8); \
+			((_flags) & 0xffff) | ((_module_number) << 16); \
 	} while (0)
 
 #define REGISTER_NULL_CONSTANT(name, flags)  zend_register_null_constant((name), sizeof(name)-1, (flags), module_number)