Move handling of ZEND_AST_OP_ARRAY last

Author: TimWolla

Zend/zend_ast.c

@@ -1117,13 +1117,6 @@ static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 		ZVAL_STR_COPY(&new->val, zend_ast_get_constant_name(ast));
 		Z_LINENO(new->val) = zend_ast_get_lineno(ast);
 		buf = (void*)((char*)buf + sizeof(zend_ast_zval));
-	} else if (ast->kind == ZEND_AST_OP_ARRAY) {
-		zend_ast_zval *new = (zend_ast_zval*)buf;
-		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);
-		buf = (void*)((char*)buf + sizeof(zend_ast_zval));
 	} else if (zend_ast_is_list(ast)) {
 		zend_ast_list *list = zend_ast_get_list(ast);
 		zend_ast_list *new = (zend_ast_list*)buf;
@@ -1141,6 +1134,13 @@ static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 				new->child[i] = NULL;
 			}
 		}
+	} else if (ast->kind == ZEND_AST_OP_ARRAY) {
+		zend_ast_zval *new = (zend_ast_zval*)buf;
+		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);
+		buf = (void*)((char*)buf + sizeof(zend_ast_zval));
 	} else {
 		uint32_t i, children = zend_ast_get_num_children(ast);
 		zend_ast *new = (zend_ast*)buf;
@@ -1191,8 +1191,6 @@ 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_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);
 		if (list->children) {
@@ -1206,6 +1204,8 @@ ZEND_API void ZEND_FASTCALL zend_ast_destroy(zend_ast *ast)
 		}
 	} else if (EXPECTED(ast->kind == ZEND_AST_CONSTANT)) {
 		zend_string_release_ex(zend_ast_get_constant_name(ast), 0);
+	} else if (EXPECTED(ast->kind == ZEND_AST_OP_ARRAY)) {
+		zval_ptr_dtor_nogc(&((zend_ast_zval*)(ast))->val);
 	} else if (EXPECTED(ast->kind >= ZEND_AST_FUNC_DECL)) {
 		zend_ast_decl *decl = (zend_ast_decl *) ast;
 

ext/opcache/zend_persist.c

@@ -178,10 +178,6 @@ static zend_ast *zend_persist_ast(zend_ast *ast)
 		zend_ast_zval *copy = zend_shared_memdup(ast, sizeof(zend_ast_zval));
 		zend_persist_zval(&copy->val);
 		node = (zend_ast *) copy;
-	} else 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;
 	} else if (zend_ast_is_list(ast)) {
 		zend_ast_list *list = zend_ast_get_list(ast);
 		zend_ast_list *copy = zend_shared_memdup(ast,
@@ -192,6 +188,10 @@ static zend_ast *zend_persist_ast(zend_ast *ast)
 			}
 		}
 		node = (zend_ast *) copy;
+	} else 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;
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		node = zend_shared_memdup(ast, zend_ast_size(children));

ext/opcache/zend_persist_calc.c

@@ -78,9 +78,6 @@ static void zend_persist_ast_calc(zend_ast *ast)
 	if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT) {
 		ADD_SIZE(sizeof(zend_ast_zval));
 		zend_persist_zval_calc(&((zend_ast_zval*)(ast))->val);
-	} else 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 (zend_ast_is_list(ast)) {
 		zend_ast_list *list = zend_ast_get_list(ast);
 		ADD_SIZE(sizeof(zend_ast_list) - sizeof(zend_ast *) + sizeof(zend_ast *) * list->children);
@@ -89,6 +86,9 @@ static void zend_persist_ast_calc(zend_ast *ast)
 				zend_persist_ast_calc(list->child[i]);
 			}
 		}
+	} else if (ast->kind == ZEND_AST_OP_ARRAY) {
+		ADD_SIZE(sizeof(zend_ast_zval));
+		zend_persist_op_array_calc(&((zend_ast_zval*)(ast))->val);
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		ADD_SIZE(zend_ast_size(children));