Fix opcache support

Author: nikic

Zend/zend_compile.c

@@ -7559,7 +7559,6 @@ void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel) /* {{{
 			zend_compile_enum_backing_type(ce, enum_backing_type_ast);
 		}
 		zend_enum_add_interfaces(ce);
-		zend_enum_register_funcs(ce);
 		zend_enum_register_props(ce);
 	}
 

Zend/zend_enum.c

@@ -315,7 +315,9 @@ void zend_enum_register_funcs(zend_class_entry *ce)
 	cases_function->scope = ce;
 	cases_function->fn_flags = fn_flags;
 	cases_function->arg_info = (zend_internal_arg_info *) (arginfo_class_UnitEnum_cases + 1);
-	zend_hash_add_ptr(&ce->function_table, ZSTR_KNOWN(ZEND_STR_CASES), cases_function);
+	if (!zend_hash_add_ptr(&ce->function_table, ZSTR_KNOWN(ZEND_STR_CASES), cases_function)) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Cannot redeclare %s::cases()", ZSTR_VAL(ce->name));
+	}
 
 	if (ce->enum_backing_type != IS_UNDEF) {
 		zend_internal_function *from_function =
@@ -330,7 +332,10 @@ void zend_enum_register_funcs(zend_class_entry *ce)
 		from_function->num_args = 1;
 		from_function->required_num_args = 1;
 		from_function->arg_info = (zend_internal_arg_info *) (arginfo_class_BackedEnum_from + 1);
-		zend_hash_add_ptr(&ce->function_table, ZSTR_KNOWN(ZEND_STR_FROM), from_function);
+		if (!zend_hash_add_ptr(&ce->function_table, ZSTR_KNOWN(ZEND_STR_FROM), from_function)) {
+			zend_error_noreturn(E_COMPILE_ERROR,
+				"Cannot redeclare %s::from()", ZSTR_VAL(ce->name));
+		}
 
 		zend_internal_function *try_from_function =
 			zend_arena_alloc(&CG(arena), sizeof(zend_internal_function));
@@ -344,8 +349,11 @@ void zend_enum_register_funcs(zend_class_entry *ce)
 		try_from_function->num_args = 1;
 		try_from_function->required_num_args = 1;
 		try_from_function->arg_info = (zend_internal_arg_info *) (arginfo_class_BackedEnum_tryFrom + 1);
-		zend_hash_add_ptr(
-			&ce->function_table, ZSTR_KNOWN(ZEND_STR_TRYFROM_LOWERCASE), try_from_function);
+		if (!zend_hash_add_ptr(
+				&ce->function_table, ZSTR_KNOWN(ZEND_STR_TRYFROM_LOWERCASE), try_from_function)) {
+			zend_error_noreturn(E_COMPILE_ERROR,
+				"Cannot redeclare %s::tryFrom()", ZSTR_VAL(ce->name));
+		}
 	}
 }
 

Zend/zend_inheritance.c

@@ -2697,6 +2697,12 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 		}
 	}
 
+#ifndef ZEND_WIN32
+	if (ce->ce_flags & ZEND_ACC_ENUM) {
+		/* We will add internal methods. */
+		is_cacheable = false;
+	}
+#endif
 
 	if (ce->ce_flags & ZEND_ACC_IMMUTABLE) {
 		if (is_cacheable) {
@@ -2741,6 +2747,12 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 	orig_linking_class = CG(current_linking_class);
 	CG(current_linking_class) = is_cacheable ? ce : NULL;
 
+	if (ce->ce_flags & ZEND_ACC_ENUM) {
+		/* Only register builtin enum methods during inheritance to avoid persisting them in
+		 * opcache. */
+		zend_enum_register_funcs(ce);
+	}
+
 	if (parent) {
 		if (!(parent->ce_flags & ZEND_ACC_LINKED)) {
 			add_dependency_obligation(ce, parent);