Simplify

Author: TimWolla

Zend/zend_ast.c

@@ -993,9 +993,7 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 		}
 		case ZEND_AST_CLOSURE_CONSTEXPR:
 		{
-			zend_ast *child = ast->child[0];
-			zval *z = zend_ast_get_zval(child);
-			zend_function *func = Z_PTR_P(z);
+			zend_function *func = Z_PTR_P(&((zend_ast_zval*)(ast))->val);
 
 			zend_create_closure(result, func, scope, scope, NULL);
 			return SUCCESS;	
@@ -1079,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) {
+	if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT || ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
 		size = sizeof(zend_ast_zval);
 	} else if (zend_ast_is_list(ast)) {
 		uint32_t i;
@@ -1106,7 +1104,14 @@ 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_ZVAL) {
+	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
+		zend_ast_zval *new = (zend_ast_zval*)buf;
+		new->kind = ZEND_AST_CLOSURE_CONSTEXPR;
+		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 (ast->kind == ZEND_AST_ZVAL) {
 		zend_ast_zval *new = (zend_ast_zval*)buf;
 		new->kind = ZEND_AST_ZVAL;
 		new->attr = ast->attr;
@@ -1187,6 +1192,8 @@ 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)) {
+		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) {

Zend/zend_ast.h

@@ -34,6 +34,7 @@
 enum _zend_ast_kind {
 	/* special nodes */
 	ZEND_AST_ZVAL = 1 << ZEND_AST_SPECIAL_SHIFT,
+	ZEND_AST_CLOSURE_CONSTEXPR,
 	ZEND_AST_CONSTANT,
 	ZEND_AST_ZNODE,
 
@@ -111,8 +112,6 @@ enum _zend_ast_kind {
 	ZEND_AST_CONTINUE,
 	ZEND_AST_PROPERTY_HOOK_SHORT_BODY,
 
-	ZEND_AST_CLOSURE_CONSTEXPR,
-
 	/* 2 child nodes */
 	ZEND_AST_DIM = 2 << ZEND_AST_NUM_CHILDREN_SHIFT,
 	ZEND_AST_PROP,

Zend/zend_compile.c

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

ext/opcache/zend_persist.c

@@ -177,9 +177,9 @@ static zend_ast *zend_persist_ast(zend_ast *ast)
 	zend_ast *node;
 
 	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
-		uint32_t children = zend_ast_get_num_children(ast);
-		node = zend_shared_memdup(ast, zend_ast_size(children));
-		zend_persist_op_array(zend_ast_get_zval(node->child[0]));
+		zend_ast_zval *copy = zend_shared_memdup(ast, sizeof(zend_ast_zval));
+		zend_persist_op_array(&copy->val);
+		node = (zend_ast *) copy;
 	} else if (ast->kind == ZEND_AST_ZVAL || ast->kind == ZEND_AST_CONSTANT) {
 		zend_ast_zval *copy = zend_shared_memdup(ast, sizeof(zend_ast_zval));
 		zend_persist_zval(&copy->val);

ext/opcache/zend_persist_calc.c

@@ -79,7 +79,7 @@ static void zend_persist_ast_calc(zend_ast *ast)
 
 	if (ast->kind == ZEND_AST_CLOSURE_CONSTEXPR) {
 		ADD_SIZE(sizeof(zend_ast_zval));
-		zend_persist_op_array_calc(zend_ast_get_zval(ast->child[0]));
+		zend_persist_op_array_calc(&((zend_ast_zval*)(ast))->val);
 	} else 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);