Implement changes requested from code review

Author: iluuu1994

Zend/tests/enum/backed-duplicate-int.phpt

@@ -8,6 +8,8 @@ enum Foo: int {
     case Baz = 0;
 }
 
+var_dump(Foo::Bar);
+
 ?>
 --EXPECTF--
 Fatal error: Duplicate value in enum Foo for cases Bar and Baz in %s on line %s

Zend/tests/enum/backed-duplicate-string.phpt

@@ -10,6 +10,8 @@ enum Suit: string {
     case Spades = 'H';
 }
 
+var_dump(Suit::Hearts);
+
 ?>
 --EXPECTF--
 Fatal error: Duplicate value in enum Suit for cases Hearts and Spades in %s on line %s

Zend/tests/enum/backed-mismatch.phpt

@@ -7,6 +7,8 @@ enum Foo: int {
     case Bar = 'bar';
 }
 
+var_dump(Foo::Bar);
+
 ?>
 --EXPECTF--
 Fatal error: Enum case type string does not match enum backing type int in %s on line %d

Zend/tests/enum/name-property.phpt

@@ -23,7 +23,7 @@ var_dump(IntFoo::Bar->name);
 --EXPECT--
 array(1) {
   [0]=>
-  object(ReflectionProperty)#4 (2) {
+  object(ReflectionProperty)#2 (2) {
     ["name"]=>
     string(4) "name"
     ["class"]=>
@@ -33,14 +33,14 @@ array(1) {
 string(3) "Bar"
 array(2) {
   [0]=>
-  object(ReflectionProperty)#5 (2) {
+  object(ReflectionProperty)#3 (2) {
     ["name"]=>
     string(4) "name"
     ["class"]=>
     string(6) "IntFoo"
   }
   [1]=>
-  object(ReflectionProperty)#6 (2) {
+  object(ReflectionProperty)#4 (2) {
     ["name"]=>
     string(5) "value"
     ["class"]=>

Zend/tests/enum/update-class-constant-failure.phpt

@@ -7,8 +7,11 @@ enum Foo: string {
     const Bar = NONEXISTENT;
 }
 
+var_dump(Foo::Bar);
+
 ?>
 --EXPECTF--
-Fatal error: During updating of class constants: Uncaught Error: Undefined constant "NONEXISTENT" in %s:%d
+Fatal error: Uncaught Error: Undefined constant "NONEXISTENT" in %s:%d
 Stack trace:
-#0 {main} in %s on line %d
+#0 {main}
+  thrown in %s on line %d

Zend/zend_API.c

@@ -30,6 +30,7 @@
 #include "zend_closures.h"
 #include "zend_inheritance.h"
 #include "zend_ini.h"
+#include "zend_enum.h"
 
 #include <stdarg.h>
 
@@ -1503,6 +1504,10 @@ ZEND_API zend_result zend_update_class_constants(zend_class_entry *class_type) /
 		class_type->ce_flags = ce_flags;
 	}
 
+	if (class_type->ce_flags & ZEND_ACC_ENUM && class_type->enum_backing_type != IS_UNDEF) {
+		zend_enum_build_backed_enum_table(class_type);
+	}
+
 	return SUCCESS;
 }
 /* }}} */

Zend/zend_ast.c

@@ -778,20 +778,16 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate(zval *result, zend_ast *ast
 			zend_ast *case_value_ast = ast->child[2];
 
 			zval case_value_zv;
-			zval *case_value_zv_ptr = NULL;
+			ZVAL_UNDEF(&case_value_zv);
 			if (case_value_ast != NULL) {
 				if (UNEXPECTED(zend_ast_evaluate(&case_value_zv, case_value_ast, scope) != SUCCESS)) {
-					ret = FAILURE;
-					break;
+					return FAILURE;
 				}
-				case_value_zv_ptr = &case_value_zv;
 			}
 
 			zend_class_entry *ce = zend_lookup_class(class_name);
-			zend_enum_new(result, ce, case_name, case_value_zv_ptr);
-			if (case_value_zv_ptr != NULL) {
-				Z_TRY_DELREF_P(case_value_zv_ptr);
-			}
+			zend_enum_new(result, ce, case_name, case_value_ast != NULL ? &case_value_zv : NULL);
+			zval_ptr_dtor_nogc(&case_value_zv);
 			break;
 		}
 		case ZEND_AST_CLASS_CONST:

Zend/zend_enum.c

@@ -190,9 +190,7 @@ void zend_enum_build_backed_enum_table(zend_class_entry *ce)
 	uint32_t backing_type = ce->enum_backing_type;
 	ZEND_ASSERT(backing_type != IS_UNDEF);
 
-	if (zend_update_class_constants(ce) == FAILURE) {
-		zend_exception_uncaught_error("During updating of class constants");
-	}
+	ZEND_ASSERT(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED);
 
 	ce->backed_enum_table = emalloc(sizeof(HashTable));
 	zend_hash_init(ce->backed_enum_table, 0, NULL, ZVAL_PTR_DTOR, 0);
@@ -268,6 +266,10 @@ static ZEND_NAMED_FUNCTION(zend_enum_cases_func)
 
 ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_class_entry *ce, zend_long long_key, zend_string *string_key, bool try)
 {
+	if (!(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
+		zend_update_class_constants(ce);
+	}
+
 	zval *case_name_zv;
 	if (ce->enum_backing_type == IS_LONG) {
 		case_name_zv = zend_hash_index_find(ce->backed_enum_table, long_key);

Zend/zend_inheritance.c

@@ -2933,10 +2933,6 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 		ZSTR_SET_CE_CACHE(ce->name, ce);
 	}
 
-	if (ce->ce_flags & ZEND_ACC_ENUM && ce->enum_backing_type != IS_UNDEF) {
-		zend_enum_build_backed_enum_table(ce);
-	}
-
 	return ce;
 }
 /* }}} */

Zend/zend_vm_def.h

@@ -5897,7 +5897,13 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
 			}
 			value = &c->value;
 			if (Z_TYPE_P(value) == IS_CONSTANT_AST) {
-				zval_update_constant_ex(value, c->ce);
+				ce = c->ce;
+				if (ce->ce_flags & ZEND_ACC_ENUM && ce->enum_backing_type != IS_UNDEF) {
+					// Enums require loading of all class constants to build the backed enum table
+					zend_update_class_constants(ce);
+				} else {
+					zval_update_constant_ex(value, ce);
+				}
 				if (UNEXPECTED(EG(exception) != NULL)) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
 					HANDLE_EXCEPTION();