Merge branch 'PHP-8.4'

nikic · nikic · commit 910411f2f5ba · 2025-06-01T20:36:01.000+02:00
* PHP-8.4:
  Fix line assignment in zend_ast_create_va()
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -304,7 +304,7 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_va(
 	ast->attr = attr;
 	for (uint32_t i = 0; i < children; i++) {
 		ast->child[i] = va_arg(*va, zend_ast *);
-		if (lineno != (uint32_t)-1 && ast->child[i]) {
+		if (lineno == (uint32_t)-1 && ast->child[i]) {
 			lineno = zend_ast_get_lineno(ast->child[i]);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_va(`
`304`	`304`	`ast->attr = attr;`
`305`	`305`	`for (uint32_t i = 0; i < children; i++) {`
`306`	`306`	`ast->child[i] = va_arg(va, zend_ast );`
`307`		`- if (lineno != (uint32_t)-1 && ast->child[i]) {`
	`307`	`+ if (lineno == (uint32_t)-1 && ast->child[i]) {`
`308`	`308`	`lineno = zend_ast_get_lineno(ast->child[i]);`
`309`	`309`	`}`
`310`	`310`	`}`