Happy path at the bottom

DanielEScherzer · DanielEScherzer · commit 7fa8ceeb093e · 2025-08-16T08:18:13.000-07:00
diff --git a/Zend/zend_attributes.c b/Zend/zend_attributes.c
@@ -218,13 +218,13 @@ static zend_string *validate_nodiscard(
 {
 	ZEND_ASSERT(CG(in_compilation));
 	const zend_string *prop_info_name = CG(context).active_property_info_name;
-	if (prop_info_name == NULL) {
-		zend_op_array *op_array = CG(active_op_array);
-		op_array->fn_flags |= ZEND_ACC_NODISCARD;
-		return NULL;
+	if (prop_info_name != NULL) {
+		// Applied to a hook
+		return ZSTR_INIT_LITERAL("#[\\NoDiscard] is not supported for property hooks", 0);
 	}
-	// Applied to a hook
-	return ZSTR_INIT_LITERAL("#[\\NoDiscard] is not supported for property hooks", 0);
+	zend_op_array *op_array = CG(active_op_array);
+	op_array->fn_flags |= ZEND_ACC_NODISCARD;
+	return NULL;
 }
 
 ZEND_METHOD(NoDiscard, __construct)

Original file line number	Diff line number	Diff line change
`@@ -218,13 +218,13 @@ static zend_string *validate_nodiscard(`
`218`	`218`	`{`
`219`	`219`	`ZEND_ASSERT(CG(in_compilation));`
`220`	`220`	`const zend_string *prop_info_name = CG(context).active_property_info_name;`
`221`		`- if (prop_info_name == NULL) {`
`222`		`- zend_op_array *op_array = CG(active_op_array);`
`223`		`- op_array->fn_flags \|= ZEND_ACC_NODISCARD;`
`224`		`- return NULL;`
	`221`	`+ if (prop_info_name != NULL) {`
	`222`	`+ // Applied to a hook`
	`223`	`+ return ZSTR_INIT_LITERAL("#[\\NoDiscard] is not supported for property hooks", 0);`
`225`	`224`	`}`
`226`		`- // Applied to a hook`
`227`		`- return ZSTR_INIT_LITERAL("#[\\NoDiscard] is not supported for property hooks", 0);`
	`225`	`+ zend_op_array *op_array = CG(active_op_array);`
	`226`	`+ op_array->fn_flags \|= ZEND_ACC_NODISCARD;`
	`227`	`+ return NULL;`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`ZEND_METHOD(NoDiscard, __construct)`