Improve PFA func name

Author: arnaud-lb

Zend/tests/partial_application/function_name.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Partial application function name
+--FILE--
+<?php
+
+function g($a) {}
+
+function f() {
+    var_dump((new ReflectionFunction(g(?)))->getName());
+}
+
+f();
+
+var_dump((new ReflectionFunction(g(?)))->getName());
+
+?>
+--EXPECTF--
+string(19) "{closure:pfa:f():6}"
+string(94) "{closure:pfa:%sfunction_name.php:11}"

Zend/zend_partial.c

@@ -443,6 +443,47 @@ static zend_ast *zp_param_attributes_to_ast(zend_function *function,
 	return attributes_ast;
 }
 
+static zend_string *zp_pfa_name(const zend_op_array *declaring_op_array,
+		const zend_op *declaring_opline)
+{
+	zend_string *filename = declaring_op_array->filename;
+	uint32_t start_lineno = declaring_opline->lineno;
+
+	zend_string *class = zend_empty_string;
+	zend_string *separator = zend_empty_string;
+	zend_string *function = filename;
+	const char *parens = "";
+
+	if (declaring_op_array->function_name) {
+		if (declaring_op_array->fn_flags & ZEND_ACC_CLOSURE) {
+			/* If the parent function is a closure, don't redundantly
+			 * add the classname and parentheses.
+			 */
+			function = declaring_op_array->function_name;
+		} else {
+			function = declaring_op_array->function_name;
+			parens = "()";
+
+			if (declaring_op_array->scope && declaring_op_array->scope->name) {
+				class = declaring_op_array->scope->name;
+				separator = ZSTR_KNOWN(ZEND_STR_PAAMAYIM_NEKUDOTAYIM);
+			}
+		}
+	}
+
+	zend_string *name = zend_strpprintf_unchecked(
+		0,
+		"{closure:pfa:%S%S%S%s:%" PRIu32 "}",
+		class,
+		separator,
+		function,
+		parens,
+		start_lineno
+	);
+
+	return name;
+}
+
 zend_ast *zp_compile_forwarding_call(
 	zval *this_ptr, zend_function *function,
 	uint32_t argc, zval *argv, zend_array *extra_named_params,
@@ -874,8 +915,10 @@ zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 	}
 #endif
 
+	zend_string *pfa_name = zp_pfa_name(declaring_op_array, declaring_opline);
+
 	op_array = zend_accel_compile_pfa(closure_ast, declaring_op_array,
-			declaring_opline, function);
+			declaring_opline, function, pfa_name);
 
 	zend_ast_destroy(closure_ast);
 

ext/opcache/ZendAccelerator.c

@@ -2071,7 +2071,8 @@ zend_op_array *zend_accel_pfa_cache_get(const zend_op_array *declaring_op_array,
 zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 		const zend_op_array *declaring_op_array,
 		const zend_op *declaring_opline,
-		const zend_function *called_function)
+		const zend_function *called_function,
+		zend_string *pfa_func_name)
 {
 	// TODO: file cache support
 
@@ -2117,6 +2118,9 @@ zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 		return NULL;
 	}
 
+	zend_string_release(op_array->dynamic_func_defs[0]->function_name);
+	op_array->dynamic_func_defs[0]->function_name = pfa_func_name;
+
 	/* Cache op_array only if the declaring op_array and the called function
 	 * are cached */
 	if (!ZCG(accelerator_enabled)

ext/opcache/ZendAccelerator.h

@@ -343,7 +343,8 @@ zend_op_array *zend_accel_pfa_cache_get(const zend_op_array *declaring_op_array,
 zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 		const zend_op_array *declaring_op_array,
 		const zend_op *declaring_opline,
-		const zend_function *called_function);
+		const zend_function *called_function,
+		zend_string *pfa_func_name);
 
 END_EXTERN_C()