Use distinct constants for AST attrs, simplify placeholder types

Author: arnaud-lb

Zend/zend_ast.c

@@ -1146,7 +1146,7 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 
 					zend_ast_list *args = zend_ast_get_list(fcc_ast->args);
 					ZEND_ASSERT(args->children > 0);
-					if (args->children != 1 || args->child[0]->attr != _IS_PLACEHOLDER_VARIADIC) {
+					if (args->children != 1 || args->child[0]->attr != ZEND_PLACEHOLDER_VARIADIC) {
 						/* TODO: PFAs */
 						return FAILURE;
 					}
@@ -1180,7 +1180,7 @@ static zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 
 					zend_ast_list *args = zend_ast_get_list(fcc_ast->args);
 					ZEND_ASSERT(args->children > 0);
-					if (args->children != 1 || args->child[0]->attr != _IS_PLACEHOLDER_VARIADIC) {
+					if (args->children != 1 || args->child[0]->attr != ZEND_PLACEHOLDER_VARIADIC) {
 						/* TODO: PFAs */
 						return FAILURE;
 					}
@@ -2405,12 +2405,10 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 			}
 			break;
 		case ZEND_AST_PLACEHOLDER_ARG:
-			if (ast->attr == _IS_PLACEHOLDER_ARG) {
-				APPEND_STR("?");
-			} else if (ast->attr == _IS_PLACEHOLDER_VARIADIC) {
+			if (ast->attr == ZEND_PLACEHOLDER_VARIADIC) {
 				APPEND_STR("...");
-			} else {
-				ZEND_UNREACHABLE();
+			} else  {
+				APPEND_STR("?");
 			}
 			break;
 

Zend/zend_compile.c

@@ -3951,7 +3951,7 @@ static bool zend_compile_call_common(znode *result, zend_ast *args_ast, const ze
 		}
 
 		zend_ast_list *args = zend_ast_get_list(((zend_ast_fcc*)args_ast)->args);
-		if (args->children != 1 || args->child[0]->attr != _IS_PLACEHOLDER_VARIADIC) {
+		if (args->children != 1 || args->child[0]->attr != ZEND_PLACEHOLDER_VARIADIC) {
 			zend_error_noreturn(E_COMPILE_ERROR, "Cannot create a Closure for call expression with more than one argument, or non-variadic placeholders");
 		}
 

Zend/zend_compile.h

@@ -1236,6 +1236,9 @@ static zend_always_inline bool zend_check_arg_send_type(const zend_function *zf,
 #define ZEND_IS_BINARY_ASSIGN_OP_OPCODE(opcode) \
 	(((opcode) >= ZEND_ADD) && ((opcode) <= ZEND_POW))
 
+/* PFAs/FCCs */
+#define ZEND_PLACEHOLDER_VARIADIC (1<<0)
+
 /* Pseudo-opcodes that are used only temporarily during compilation */
 #define ZEND_GOTO  253
 #define ZEND_BRK   254

Zend/zend_language_parser.y

@@ -940,11 +940,11 @@ argument_no_expr:
 		identifier ':' expr
 			{ $$ = zend_ast_create(ZEND_AST_NAMED_ARG, $1, $3); }
 	|	T_ELLIPSIS
-			{ $$ = zend_ast_create_ex(ZEND_AST_PLACEHOLDER_ARG, _IS_PLACEHOLDER_VARIADIC); }
+			{ $$ = zend_ast_create_ex(ZEND_AST_PLACEHOLDER_ARG, ZEND_PLACEHOLDER_VARIADIC); }
 	|	'?'
-			{ $$ = zend_ast_create_ex(ZEND_AST_PLACEHOLDER_ARG, _IS_PLACEHOLDER_ARG); }
+			{ $$ = zend_ast_create(ZEND_AST_PLACEHOLDER_ARG); }
 	|	identifier ':' '?'
-			{ $$ = zend_ast_create(ZEND_AST_NAMED_ARG, $1, zend_ast_create_ex(ZEND_AST_PLACEHOLDER_ARG, _IS_PLACEHOLDER_ARG)); }
+			{ $$ = zend_ast_create(ZEND_AST_NAMED_ARG, $1, zend_ast_create(ZEND_AST_PLACEHOLDER_ARG)); }
 	|	T_ELLIPSIS expr
 			{ $$ = zend_ast_create(ZEND_AST_UNPACK, $2); }
 ;

Zend/zend_types.h

@@ -639,8 +639,7 @@ struct _zend_ast_ref {
 #define _IS_NUMBER					19
 
 /* used for PFAs/FCCs */
-#define _IS_PLACEHOLDER_ARG         20
-#define _IS_PLACEHOLDER_VARIADIC    21
+#define _IS_PLACEHOLDER             20
 
 /* guard flags */
 #define ZEND_GUARD_PROPERTY_GET		(1<<0)