Review

arnaud-lb · arnaud-lb · commit 79d4e841018e · 2026-01-07T18:57:33.000+01:00
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -1141,7 +1141,7 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 			zend_class_entry *called_scope = NULL;
 
 			zend_ast *args_ast = zend_ast_call_get_args(ast);
-			ZEND_ASSERT(args_ast && args_ast->kind == ZEND_AST_CALLABLE_CONVERT);
+			ZEND_ASSERT(args_ast->kind == ZEND_AST_CALLABLE_CONVERT);
 
 			zend_ast_fcc *fcc_ast = (zend_ast_fcc*)args_ast;
 
@@ -3084,5 +3084,6 @@ zend_ast * ZEND_FASTCALL zend_ast_call_get_args(zend_ast *ast)
 		return ast->child[2];
 	}
 
+	ZEND_UNREACHABLE();
 	return NULL;
 }

Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,7 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_inner(`
`1141`	`1141`	`zend_class_entry *called_scope = NULL;`
`1142`	`1142`
`1143`	`1143`	`zend_ast *args_ast = zend_ast_call_get_args(ast);`
`1144`		`- ZEND_ASSERT(args_ast && args_ast->kind == ZEND_AST_CALLABLE_CONVERT);`
	`1144`	`+ ZEND_ASSERT(args_ast->kind == ZEND_AST_CALLABLE_CONVERT);`
`1145`	`1145`
`1146`	`1146`	`zend_ast_fcc fcc_ast = (zend_ast_fcc)args_ast;`
`1147`	`1147`
`@@ -3084,5 +3084,6 @@ zend_ast * ZEND_FASTCALL zend_ast_call_get_args(zend_ast *ast)`
`3084`	`3084`	`return ast->child[2];`
`3085`	`3085`	`}`
`3086`	`3086`
	`3087`	`+ ZEND_UNREACHABLE();`
`3087`	`3088`	`return NULL;`
`3088`	`3089`	`}`