Merge branch 'PHP-8.1' into PHP-8.2

cmb69 · cmb69 · commit 66605994adb0 · 2023-01-18T16:28:04.000+01:00
* PHP-8.1:
  Fix incorrect check condition in ZEND_YIELD
diff --git a/NEWS b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.2.3
 
+- Core:
+  . Fixed incorrect check condition in ZEND_YIELD. (nielsdos)
 
 02 Feb 2023, PHP 8.2.2
 
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -8180,7 +8180,7 @@ ZEND_VM_HANDLER(160, ZEND_YIELD, CONST|TMP|VAR|CV|UNUSED, CONST|TMPVAR|CV|UNUSED
 	/* Set the new yielded key */
 	if (OP2_TYPE != IS_UNUSED) {
 		zval *key = GET_OP2_ZVAL_PTR(BP_VAR_R);
-		if ((OP2_TYPE & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((OP2_TYPE & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h

Original file line number	Diff line number	Diff line change
`@@ -8180,7 +8180,7 @@ ZEND_VM_HANDLER(160, ZEND_YIELD, CONST\|TMP\|VAR\|CV\|UNUSED, CONST\|TMPVAR\|CV\|UNUSED`
`8180`	`8180`	`/* Set the new yielded key */`
`8181`	`8181`	`if (OP2_TYPE != IS_UNUSED) {`
`8182`	`8182`	`zval *key = GET_OP2_ZVAL_PTR(BP_VAR_R);`
`8183`		`- if ((OP2_TYPE & (IS_CV\|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {`
	`8183`	`+ if ((OP2_TYPE & (IS_CV\|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {`
`8184`	`8184`	`key = Z_REFVAL_P(key);`
`8185`	`8185`	`}`
`8186`	`8186`	`ZVAL_COPY(&generator->key, key);`