Merge branch 'PHP-8.1'

nikic · nikic · commit 701e10c3b982 · 2022-04-15T23:56:04.000+02:00
* PHP-8.1:
  Don't set ce for by-ref return type
diff --git a/Zend/Optimizer/zend_func_info.c b/Zend/Optimizer/zend_func_info.c
@@ -186,6 +186,7 @@ ZEND_API uint32_t zend_get_func_info(
 			/* It's allowed to override a method that return non-reference with a method that returns a reference */
 			if (call_info->is_prototype && (ret & ~MAY_BE_REF)) {
 				ret |= MAY_BE_REF;
+				*ce = NULL;
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ ZEND_API uint32_t zend_get_func_info(`
`186`	`186`	`/* It's allowed to override a method that return non-reference with a method that returns a reference */`
`187`	`187`	`if (call_info->is_prototype && (ret & ~MAY_BE_REF)) {`
`188`	`188`	`ret \|= MAY_BE_REF;`
	`189`	`+ *ce = NULL;`
`189`	`190`	`}`
`190`	`191`	`}`
`191`	`192`	`}`