Print placeholder value when printing ZEND_AST_OP_ARRAY

Author: TimWolla

Zend/tests/closure_const_expr/attributes_ast_printing_runtime.phpt

@@ -17,8 +17,6 @@ foreach ($r->getAttributes() as $attribute) {
 --EXPECT--
 Attribute [ Attr ] {
   - Arguments [1] {
-    Argument #0 [ static function ($foo) {
-    echo $foo;
-} ]
+    Argument #0 [ Closure({closure:foo():3}) ]
   }
 }

Zend/zend_ast.c

@@ -100,15 +100,14 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_constant(zend_string *name, ze
 	return (zend_ast *) ast;
 }
 
-ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_op_array(zend_op_array *op_array, zend_string *original_ast) {
+ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_op_array(zend_op_array *op_array) {
 	zend_ast_op_array *ast;
 
 	ast = zend_ast_alloc(sizeof(zend_ast_op_array));
 	ast->kind = ZEND_AST_OP_ARRAY;
 	ast->attr = 0;
 	ast->lineno = CG(zend_lineno);
 	ast->op_array = op_array;
-	ast->original_ast = original_ast;
 
 	return (zend_ast *) ast;
 }
@@ -1159,7 +1158,6 @@ static void* ZEND_FASTCALL zend_ast_tree_copy(zend_ast *ast, void *buf)
 		new->attr = old->attr;
 		new->lineno = old->lineno;
 		new->op_array = old->op_array;
-		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)) {
 		/* Not implemented. */
@@ -1228,7 +1226,7 @@ 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)) {
-		zend_string_release_ex(zend_ast_get_op_array(ast)->original_ast, 0);
+		/* Nothing to do. */
 	} else if (EXPECTED(zend_ast_is_decl(ast))) {
 		zend_ast_decl *decl = (zend_ast_decl *) ast;
 
@@ -1888,7 +1886,9 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 			break;
 		}
 		case ZEND_AST_OP_ARRAY:
-			smart_str_append(str, zend_ast_get_op_array(ast)->original_ast);
+			smart_str_appends(str, "Closure(");
+			smart_str_append(str, zend_ast_get_op_array(ast)->op_array->function_name);
+			smart_str_appends(str, ")");
 			break;
 		case ZEND_AST_CONSTANT_CLASS:
 			smart_str_appendl(str, "__CLASS__", sizeof("__CLASS__")-1);

Zend/zend_ast.h

@@ -214,7 +214,6 @@ typedef struct _zend_ast_op_array {
 	zend_ast_attr attr;
 	uint32_t lineno;
 	zend_op_array *op_array;
-	zend_string *original_ast;
 } zend_ast_op_array;
 
 /* Separate structure for function and class declaration, as they need extra information. */
@@ -241,7 +240,7 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_zval_from_long(zend_long lval)
 ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_constant(zend_string *name, zend_ast_attr attr);
 ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_class_const_or_name(zend_ast *class_name, zend_ast *name);
 
-ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_op_array(zend_op_array *op_array, zend_string *original_ast);
+ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_op_array(zend_op_array *op_array);
 
 #if ZEND_AST_SPEC
 # define ZEND_AST_SPEC_CALL(name, ...) \

Zend/zend_compile.c

@@ -11222,10 +11222,8 @@ static void zend_compile_const_expr_closure(zend_ast **ast_ptr)
 	znode node;
 	zend_op_array *op = zend_compile_func_decl(&node, (zend_ast*)closure_ast, FUNC_DECL_LEVEL_CONSTEXPR);
 
-	zend_string *original_ast = zend_ast_export("", *ast_ptr, "");
 	zend_ast_destroy(*ast_ptr);
-	*ast_ptr = zend_ast_create_op_array(op, original_ast);
-
+	*ast_ptr = zend_ast_create_op_array(op);
 }
 
 static void zend_compile_const_expr_args(zend_ast **ast_ptr)

ext/opcache/zend_file_cache.c

@@ -366,8 +366,6 @@ static void zend_file_cache_serialize_ast(zend_ast                 *ast,
 	} else if (ast->kind == ZEND_AST_OP_ARRAY) {
 		/* The op_array itself will be serialized as part of the dynamic_func_defs. */
 		SERIALIZE_PTR(zend_ast_get_op_array(ast)->op_array);
-
-		SERIALIZE_STR(zend_ast_get_op_array(ast)->original_ast);
 	} else if (zend_ast_is_decl(ast)) {
 		/* Not implemented. */
 		ZEND_UNREACHABLE();
@@ -1253,8 +1251,6 @@ static void zend_file_cache_unserialize_ast(zend_ast                *ast,
 	} else if (ast->kind == ZEND_AST_OP_ARRAY) {
 		/* The op_array itself will be unserialized as part of the dynamic_func_defs. */
 		UNSERIALIZE_PTR(zend_ast_get_op_array(ast)->op_array);
-
-		UNSERIALIZE_STR(zend_ast_get_op_array(ast)->original_ast);
 	} else if (zend_ast_is_decl(ast)) {
 		/* Not implemented. */
 		ZEND_UNREACHABLE();

ext/opcache/zend_persist.c

@@ -194,7 +194,6 @@ static zend_ast *zend_persist_ast(zend_ast *ast)
 		ZVAL_PTR(&z, copy->op_array);
 		zend_persist_op_array(&z);
 		copy->op_array = Z_PTR(z);
-		zend_accel_store_interned_string(copy->original_ast);
 		node = (zend_ast *) copy;
 	} else if (zend_ast_is_decl(ast)) {
 		/* Not implemented. */

ext/opcache/zend_persist_calc.c

@@ -91,7 +91,6 @@ static void zend_persist_ast_calc(zend_ast *ast)
 		zval z;
 		ZVAL_PTR(&z, zend_ast_get_op_array(ast)->op_array);
 		zend_persist_op_array_calc(&z);
-		ADD_INTERNED_STRING(zend_ast_get_op_array(ast)->original_ast);
 	} else if (zend_ast_is_decl(ast)) {
 		/* Not implemented. */
 		ZEND_UNREACHABLE();