Rename to ZEND_AST_OP_ARRAY

Author: TimWolla

Zend/zend_ast.c

@@ -991,7 +991,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 			}
 			return SUCCESS;
 		}
-		case ZEND_AST_CLOSURE_CONSTEXPR:
+		case ZEND_AST_OP_ARRAY:
 		{
 			zend_function *func = Z_PTR_P(&((zend_ast_zval*)(ast))->val);
 
@@ -1077,7 +1077,7 @@ static size_t ZEND_FASTCALL zend_ast_tree_size(zend_ast *ast)
 {
 	size_t size;
 
-	if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT || ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
+	if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT || ast->kind == ZEND_AST_OP_ARRAY) {
 		size = sizeof(zend_ast_zval);
 	} else if (zend_ast_is_list(ast)) {
 		uint32_t i;
@@ -1104,9 +1104,9 @@ static size_t ZEND_FASTCALL zend_ast_tree_size(zend_ast *ast)
 
 static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 {
-	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
+	if (ast->kind == ZEND_AST_OP_ARRAY) {
 		zend_ast_zval *new = (zend_ast_zval*)buf;
-		new->kind = ZEND_AST_CLOSURE_CONSTEXPR;
+		new->kind = ZEND_AST_OP_ARRAY;
 		new->attr = ast->attr;
 		ZVAL_COPY(&new->val, &((zend_ast_zval *) ast)->val);
 		Z_LINENO(new->val) = zend_ast_get_lineno(ast);
@@ -1192,7 +1192,7 @@ ZEND_API void ZEND_FASTCALL zend_ast_destroy(zend_ast *ast)
 		goto tail_call;
 	} else if (EXPECTED(ast->kind == ZEND_AST_ZVAL)) {
 		zval_ptr_dtor_nogc(zend_ast_get_zval(ast));
-	} else if (EXPECTED(ast->kind == ZEND_AST_CLOSURE_CONSTEXPR)) {
+	} else if (EXPECTED(ast->kind == ZEND_AST_OP_ARRAY)) {
 		zval_ptr_dtor_nogc(&((zend_ast_zval*)(ast))->val);
 	} else if (EXPECTED(zend_ast_is_list(ast))) {
 		zend_ast_list *list = zend_ast_get_list(ast);

Zend/zend_ast.h

@@ -34,7 +34,7 @@
 enum _zend_ast_kind {
 	/* special nodes */
 	ZEND_AST_ZVAL = 1 << ZEND_AST_SPECIAL_SHIFT,
-	ZEND_AST_CLOSURE_CONSTEXPR,
+	ZEND_AST_OP_ARRAY,
 	ZEND_AST_CONSTANT,
 	ZEND_AST_ZNODE,
 

Zend/zend_compile.c

@@ -11185,7 +11185,7 @@ static void zend_compile_const_expr_closure(zend_ast **ast_ptr)
 	zval z;
 	ZVAL_PTR(&z, op);
 	*ast_ptr = zend_ast_create_zval(&z);
-	(*ast_ptr)->kind = ZEND_AST_CLOSURE_CONSTEXPR;
+	(*ast_ptr)->kind = ZEND_AST_OP_ARRAY;
 }
 
 static void zend_compile_const_expr_args(zend_ast **ast_ptr)

ext/opcache/zend_persist.c

@@ -176,7 +176,7 @@ static zend_ast *zend_persist_ast(zend_ast *ast)
 	uint32_t i;
 	zend_ast *node;
 
-	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
+	if (ast->kind == ZEND_AST_OP_ARRAY) {
 		zend_ast_zval *copy = zend_shared_memdup(ast, sizeof(zend_ast_zval));
 		zend_persist_op_array(&copy->val);
 		node = (zend_ast *) copy;

ext/opcache/zend_persist_calc.c

@@ -77,7 +77,7 @@ static void zend_persist_ast_calc(zend_ast *ast)
 {
 	uint32_t i;
 
-	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
+	if (ast->kind == ZEND_AST_OP_ARRAY) {
 		ADD_SIZE(sizeof(zend_ast_zval));
 		zend_persist_op_array_calc(&((zend_ast_zval*)(ast))->val);
 	} else if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT) {