Fix handling of zend_ast_decl AST nodes when copying

Previously `zend_ast_decl` AST nodes were handled as if they were regular
`zend_ast` nodes.

This was not observable, because copying an AST only happened when evaluating
const-expressions, which could not include declarations until the “Support
Closures in constant expressions” RFC.

Author: TimWolla

Zend/zend_ast.c

@@ -1103,8 +1103,13 @@ static size_t ZEND_FASTCALL zend_ast_tree_size(zend_ast *ast)
 			}
 		}
 	} else if (zend_ast_is_decl(ast)) {
-		/* Not implemented. */
-		ZEND_UNREACHABLE();
+		zend_ast_decl *decl = (zend_ast_decl*)ast;
+		size = sizeof(zend_ast_decl);
+		for (size_t i = 0; i < 5; i++) {
+			if (decl->child[i]) {
+				size += zend_ast_tree_size(decl->child[i]);
+			}
+		}
 	} else {
 		uint32_t i, children = zend_ast_get_num_children(ast);
 
@@ -1160,8 +1165,33 @@ static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 		new->op_array = old->op_array;
 		buf = (void*)((char*)buf + sizeof(zend_ast_op_array));
 	} else if (zend_ast_is_decl(ast)) {
-		/* Not implemented. */
-		ZEND_UNREACHABLE();
+		zend_ast_decl *old = (zend_ast_decl*)ast;
+		zend_ast_decl *new = (zend_ast_decl*)buf;
+		new->kind = old->kind;
+		new->attr = old->attr;
+		new->start_lineno = old->start_lineno;
+		new->end_lineno = old->end_lineno;
+		new->flags = old->flags;
+		if (old->doc_comment) {
+			new->doc_comment = zend_string_copy(old->doc_comment);
+		} else {
+			new->doc_comment = NULL;
+		}
+		if (old->name) {
+			new->name = zend_string_copy(old->name);
+		} else {
+			new->name = NULL;
+		}
+
+		buf = (void*)((char*)buf + sizeof(zend_ast_decl));
+		for (size_t i = 0; i < 5; i++) {
+			if (old->child[i]) {
+				new->child[i] = (zend_ast*)buf;
+				buf = zend_ast_tree_copy(old->child[i], buf);
+			} else {
+				new->child[i] = NULL;
+			}
+		}
 	} else {
 		uint32_t i, children = zend_ast_get_num_children(ast);
 		zend_ast *new = (zend_ast*)buf;
@@ -1227,7 +1257,7 @@ ZEND_API void ZEND_FASTCALL zend_ast_destroy(zend_ast *ast)
 		zend_string_release_ex(zend_ast_get_constant_name(ast), 0);
 	} else if (EXPECTED(ast->kind == ZEND_AST_OP_ARRAY)) {
 		/* Nothing to do. */
-	} else if (EXPECTED(zend_ast_is_decl(ast))) {
+	} else if (zend_ast_is_decl(ast)) {
 		zend_ast_decl *decl = (zend_ast_decl *) ast;
 
 		if (decl->name) {

ext/opcache/zend_file_cache.c

@@ -367,8 +367,15 @@ static void zend_file_cache_serialize_ast(zend_ast                 *ast,
 		/* The op_array itself will be serialized as part of the dynamic_func_defs. */
 		SERIALIZE_PTR(zend_ast_get_op_array(ast)->op_array);
 	} else if (zend_ast_is_decl(ast)) {
-		/* Not implemented. */
-		ZEND_UNREACHABLE();
+		zend_ast_decl *decl = (zend_ast_decl*)ast;
+		for (i = 0; i < 5; i++) {
+			if (decl->child[i] && !IS_SERIALIZED(decl->child[i])) {
+				SERIALIZE_PTR(decl->child[i]);
+				tmp = decl->child[i];
+				UNSERIALIZE_PTR(tmp);
+				zend_file_cache_serialize_ast(tmp, script, info, buf);
+			}
+		}
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		for (i = 0; i < children; i++) {
@@ -1252,8 +1259,13 @@ static void zend_file_cache_unserialize_ast(zend_ast                *ast,
 		/* The op_array itself will be unserialized as part of the dynamic_func_defs. */
 		UNSERIALIZE_PTR(zend_ast_get_op_array(ast)->op_array);
 	} else if (zend_ast_is_decl(ast)) {
-		/* Not implemented. */
-		ZEND_UNREACHABLE();
+		zend_ast_decl *decl = (zend_ast_decl*)ast;
+		for (i = 0; i < 5; i++) {
+			if (decl->child[i] && !IS_UNSERIALIZED(decl->child[i])) {
+				UNSERIALIZE_PTR(decl->child[i]);
+				zend_file_cache_unserialize_ast(decl->child[i], script, buf);
+			}
+		}
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		for (i = 0; i < children; i++) {

ext/opcache/zend_persist.c

@@ -196,8 +196,13 @@ static zend_ast *zend_persist_ast(zend_ast *ast)
 		copy->op_array = Z_PTR(z);
 		node = (zend_ast *) copy;
 	} else if (zend_ast_is_decl(ast)) {
-		/* Not implemented. */
-		ZEND_UNREACHABLE();
+		zend_ast_decl *copy = zend_shared_memdup(ast, sizeof(zend_ast_decl));
+		for (i = 0; i < 5; i++) {
+			if (copy->child[i]) {
+				copy->child[i] = zend_persist_ast(copy->child[i]);
+			}
+		}
+		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

@@ -92,8 +92,13 @@ static void zend_persist_ast_calc(zend_ast *ast)
 		ZVAL_PTR(&z, zend_ast_get_op_array(ast)->op_array);
 		zend_persist_op_array_calc(&z);
 	} else if (zend_ast_is_decl(ast)) {
-		/* Not implemented. */
-		ZEND_UNREACHABLE();
+		zend_ast_decl *decl = (zend_ast_decl*)ast;
+		ADD_SIZE(sizeof(zend_ast_decl));
+		for (size_t i = 0; i < 5; i++) {
+			if (decl->child[i]) {
+				zend_persist_ast_calc(decl->child[i]);
+			}
+		}
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		ADD_SIZE(zend_ast_size(children));