TimWolla
diff --git a/‎Zend/zend_vm_def.h‎
Lines changed: 8 additions & 2 deletions b/‎Zend/zend_vm_def.h‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎Zend/zend_vm_execute.h‎
Lines changed: 24 additions & 6 deletions b/‎Zend/zend_vm_execute.h‎
Lines changed: 24 additions & 6 deletions
@@ -4160,7 +4160,10 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL,OBSERVER))
 		if ((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0) {
 			zend_deprecated_function(fbc);
 		}
-		if (EG(exception) == NULL && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0 && !RETURN_VALUE_USED(opline)) {
+		if (
+			UNEXPECTED(!RETURN_VALUE_USED(opline) && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0)
+			&& EG(exception) == NULL
+		) {
 			zend_nodiscard_function("(B)", fbc);
 		}
 		if (UNEXPECTED(EG(exception) != NULL)) {
@@ -4269,7 +4272,10 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
 		if ((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0) {
 			zend_deprecated_function(fbc);
 		}
-		if (EG(exception) == NULL && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0 && !RETURN_VALUE_USED(opline)) {
+		if (
+			UNEXPECTED(!RETURN_VALUE_USED(opline) && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0)
+			&& EG(exception) == NULL
+		) {
 			zend_nodiscard_function("(A)", fbc);
 		}
 		if (UNEXPECTED(EG(exception) != NULL)) {
Original file line number	Diff line number	Diff line change
`@@ -4160,7 +4160,10 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL,OBSERVER))`
`4160`	`4160`	`if ((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0) {`
`4161`	`4161`	`zend_deprecated_function(fbc);`
`4162`	`4162`	`}`
`4163`		`- if (EG(exception) == NULL && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0 && !RETURN_VALUE_USED(opline)) {`
	`4163`	`+ if (`
	`4164`	`+ UNEXPECTED(!RETURN_VALUE_USED(opline) && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0)`
	`4165`	`+ && EG(exception) == NULL`
	`4166`	`+ ) {`
`4164`	`4167`	`zend_nodiscard_function("(B)", fbc);`
`4165`	`4168`	`}`
`4166`	`4169`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`@@ -4269,7 +4272,10 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL,OBSERVER))`
`4269`	`4272`	`if ((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0) {`
`4270`	`4273`	`zend_deprecated_function(fbc);`
`4271`	`4274`	`}`
`4272`		`- if (EG(exception) == NULL && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0 && !RETURN_VALUE_USED(opline)) {`
	`4275`	`+ if (`
	`4276`	`+ UNEXPECTED(!RETURN_VALUE_USED(opline) && (fbc->common.fn_flags & ZEND_ACC_NODISCARD) != 0)`
	`4277`	`+ && EG(exception) == NULL`
	`4278`	`+ ) {`
`4273`	`4279`	`zend_nodiscard_function("(A)", fbc);`
`4274`	`4280`	`}`
`4275`	`4281`	`if (UNEXPECTED(EG(exception) != NULL)) {`