More explicit error for use after evaluation error

Author: nikic

Zend/tests/constexpr/evaluation_error.phpt

@@ -0,0 +1,43 @@
+--TEST--
+Error during evaluation of static/constants
+--FILE--
+<?php
+
+try {
+    class A {
+        public const C = 42;
+        public static $s1 = UNKNOWN;
+        public static $s2 = 42;
+    }
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump(A::$s2);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump(new A);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump(new A);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    // TODO: Should this fail?
+    var_dump(A::C);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Undefined constant "UNKNOWN"
+Trying to use class for which initializer evaluation has previously failed
+Trying to use class for which initializer evaluation has previously failed
+Trying to use class for which initializer evaluation has previously failed
+int(42)

Zend/tests/type_declarations/typed_properties_058.phpt

@@ -33,5 +33,5 @@ for ($i = 0; $i < 2; $i++) {
 --EXPECT--
 Cannot assign int to property B::$foo of type string
 int(5)
-Cannot assign int to property B::$foo of type string
-Cannot assign int to property B::$foo of type string
+Trying to use class for which initializer evaluation has previously failed
+Trying to use class for which initializer evaluation has previously failed

Zend/zend_API.c

@@ -1349,9 +1349,14 @@ ZEND_API zend_result zend_update_class_constants(zend_class_entry *class_type) /
 		}
 	}
 
+	if (ce_flags & ZEND_ACC_CONSTANTS_UPDATE_FAILED) {
+		zend_throw_error(NULL, "Trying to use class for which initializer evaluation has previously failed");
+		return FAILURE;
+	}
+
 	if (class_type->parent) {
 		if (UNEXPECTED(zend_update_class_constants(class_type->parent) != SUCCESS)) {
-			return FAILURE;
+			goto failure;
 		}
 	}
 
@@ -1370,7 +1375,7 @@ ZEND_API zend_result zend_update_class_constants(zend_class_entry *class_type) /
 			if (Z_TYPE(c->value) == IS_CONSTANT_AST) {
 				val = &c->value;
 				if (UNEXPECTED(zval_update_constant_ex(val, c->ce) != SUCCESS)) {
-					return FAILURE;
+					goto failure;
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -1424,17 +1429,17 @@ ZEND_API zend_result zend_update_class_constants(zend_class_entry *class_type) /
 					ZVAL_COPY(&tmp, val);
 					if (UNEXPECTED(zval_update_constant_ex(&tmp, prop_info->ce) != SUCCESS)) {
 						zval_ptr_dtor(&tmp);
-						return FAILURE;
+						goto failure;
 					}
 					/* property initializers must always be evaluated with strict types */;
 					if (UNEXPECTED(!zend_verify_property_type(prop_info, &tmp, /* strict */ 1))) {
 						zval_ptr_dtor(&tmp);
-						return FAILURE;
+						goto failure;
 					}
 					zval_ptr_dtor(val);
 					ZVAL_COPY_VALUE(val, &tmp);
 				} else if (UNEXPECTED(zval_update_constant_ex(val, prop_info->ce) != SUCCESS)) {
-					return FAILURE;
+					goto failure;
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
@@ -1456,6 +1461,14 @@ ZEND_API zend_result zend_update_class_constants(zend_class_entry *class_type) /
 	}
 
 	return SUCCESS;
+
+failure:
+	if (mutable_data) {
+		mutable_data->ce_flags |= ZEND_ACC_CONSTANTS_UPDATE_FAILED;
+	} else {
+		class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATE_FAILED;
+	}
+	return FAILURE;
 }
 /* }}} */
 

Zend/zend_compile.h

@@ -299,6 +299,8 @@ typedef struct _zend_oparray_context {
 #define ZEND_ACC_HAS_AST_STATICS         (1 << 26) /*  X  |     |     |     */
 #define ZEND_ACC_HAS_DYNAMIC_AST_PROPERTIES (1 << 29)
                                                    /*  X  |     |     |     */
+/* An error was thrown during constant updating           |     |     |     */
+#define ZEND_ACC_CONSTANTS_UPDATE_FAILED (1 << 30) /*  X  |     |     |     */
 /*                                                        |     |     |     */
 /* loaded from file cache to process memory               |     |     |     */
 #define ZEND_ACC_FILE_CACHED             (1 << 27) /*  X  |     |     |     */

ext/standard/tests/filters/object_init_failure.phpt

@@ -22,4 +22,4 @@ Undefined constant "FOO"
 Warning: file_get_contents(): Unable to create or locate filter "sample.filter" in %s on line %d
 
 Warning: file_get_contents(): Unable to create filter (sample.filter) in %s on line %d
-Undefined constant "FOO"
+Trying to use class for which initializer evaluation has previously failed

ext/standard/tests/filters/object_init_failure_2.phpt

@@ -22,4 +22,4 @@ Undefined constant "FOO"
 Warning: main(): Unable to create or locate filter "sample.filter" in %s on line %d
 
 Warning: main(): Unable to create filter (sample.filter) in %s on line %d
-Undefined constant "FOO"
+Trying to use class for which initializer evaluation has previously failed

ext/standard/tests/streams/bug77664.phpt

@@ -16,7 +16,7 @@ file_get_contents('error://test');
 --EXPECTF--
 Undefined constant self::INVALID
 
-Fatal error: Uncaught Error: Undefined constant self::INVALID in %s:%d
+Fatal error: Uncaught Error: Trying to use class for which initializer evaluation has previously failed in %s:%d
 Stack trace:
 #0 %sbug77664.php(%d): file_get_contents('error://test')
 #1 {main}

ext/tokenizer/tests/PhpToken_extension_errors.phpt

@@ -31,5 +31,5 @@ try {
 ?>
 --EXPECT--
 Undefined constant "UNKNOWN"
-Undefined constant "UNKNOWN"
+Trying to use class for which initializer evaluation has previously failed
 Cannot instantiate abstract class MyPhpToken2