Remove AST copying support for zend_ast_decl

This is unreachable / untestable now.

Author: TimWolla

Zend/zend_ast.c

@@ -1104,13 +1104,8 @@ static size_t ZEND_FASTCALL zend_ast_tree_size(zend_ast *ast)
 			}
 		}
 	} else if (zend_ast_is_decl(ast)) {
-		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]);
-			}
-		}
+		/* Not implemented. */
+		ZEND_UNREACHABLE();
 	} else {
 		uint32_t i, children = zend_ast_get_num_children(ast);
 
@@ -1167,33 +1162,8 @@ static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 		new->original_ast = zend_string_copy(old->original_ast);
 		buf = (void*)((char*)buf + sizeof(zend_ast_op_array));
 	} else if (zend_ast_is_decl(ast)) {
-		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;
-			}
-		}
+		/* Not implemented. */
+		ZEND_UNREACHABLE();
 	} else {
 		uint32_t i, children = zend_ast_get_num_children(ast);
 		zend_ast *new = (zend_ast*)buf;
@@ -1259,7 +1229,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)) {
 		zend_string_release_ex(zend_ast_get_op_array(ast)->original_ast, 0);
-	} else if (zend_ast_is_decl(ast)) {
+	} else if (EXPECTED(zend_ast_is_decl(ast))) {
 		zend_ast_decl *decl = (zend_ast_decl *) ast;
 
 		if (decl->name) {

ext/opcache/zend_file_cache.c

@@ -369,15 +369,8 @@ static void zend_file_cache_serialize_ast(zend_ast                 *ast,
 
 		SERIALIZE_STR(((zend_ast_op_array*)ast)->original_ast);
 	} else if (zend_ast_is_decl(ast)) {
-		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);
-			}
-		}
+		/* Not implemented. */
+		ZEND_UNREACHABLE();
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		for (i = 0; i < children; i++) {
@@ -1263,13 +1256,8 @@ static void zend_file_cache_unserialize_ast(zend_ast                *ast,
 
 		UNSERIALIZE_STR(((zend_ast_op_array*)ast)->original_ast);
 	} else if (zend_ast_is_decl(ast)) {
-		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);
-			}
-		}
+		/* Not implemented. */
+		ZEND_UNREACHABLE();
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		for (i = 0; i < children; i++) {

ext/opcache/zend_persist.c

@@ -197,13 +197,8 @@ static zend_ast *zend_persist_ast(zend_ast *ast)
 		zend_accel_store_interned_string(copy->original_ast);
 		node = (zend_ast *) copy;
 	} else if (zend_ast_is_decl(ast)) {
-		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;
+		/* Not implemented. */
+		ZEND_UNREACHABLE();
 	} 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

@@ -93,13 +93,8 @@ static void zend_persist_ast_calc(zend_ast *ast)
 		zend_persist_op_array_calc(&z);
 		ADD_INTERNED_STRING(zend_ast_get_op_array(ast)->original_ast);
 	} else if (zend_ast_is_decl(ast)) {
-		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]);
-			}
-		}
+		/* Not implemented. */
+		ZEND_UNREACHABLE();
 	} else {
 		uint32_t children = zend_ast_get_num_children(ast);
 		ADD_SIZE(zend_ast_size(children));