Use a pointer to the declaring opline->lineno as unique addr, instead of the declaring opline itself

This makes the API compatible with creating partials from AST:
We can pass &ast->lineno to zend_partial_create()

Author: arnaud-lb

Zend/zend_partial.c

@@ -503,14 +503,14 @@ static zend_ast *zp_param_attributes_to_ast(zend_function *function,
 }
 
 static zend_string *zp_pfa_name(const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline)
+		const uint32_t *declaring_lineno_ptr)
 {
 	/* We attempt to generate a name that hints at where the PFA was created,
 	 * similarly to Closures (GH-13550).
 	 * We do not attempt to make the name unique. */
 
 	zend_string *filename = declaring_op_array->filename;
-	uint32_t start_lineno = declaring_opline->lineno;
+	uint32_t start_lineno = *declaring_lineno_ptr;
 
 	zend_string *class = zend_empty_string;
 	zend_string *separator = zend_empty_string;
@@ -701,7 +701,7 @@ static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 		uint32_t argc, zval *argv, zend_array *extra_named_params,
 		const zend_array *named_positions,
 		const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline, void **cache_slot,
+		const uint32_t *declaring_lineno_ptr, void **cache_slot,
 		bool uses_variadic_placeholder) {
 
 	zend_op_array *op_array = NULL;
@@ -1011,10 +1011,10 @@ static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 	}
 #endif
 
-	zend_string *pfa_name = zp_pfa_name(declaring_op_array, declaring_opline);
+	zend_string *pfa_name = zp_pfa_name(declaring_op_array, declaring_lineno_ptr);
 
 	op_array = zend_accel_compile_pfa(closure_ast, declaring_op_array,
-			declaring_opline, function, pfa_name);
+			declaring_lineno_ptr, function, pfa_name);
 
 	zend_ast_destroy(closure_ast);
 
@@ -1040,7 +1040,7 @@ static const zend_op_array *zp_get_op_array(zval *this_ptr, zend_function *funct
 		uint32_t argc, zval *argv, zend_array *extra_named_params,
 		const zend_array *named_positions,
 		const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline, void **cache_slot,
+		const uint32_t *declaring_lineno_ptr, void **cache_slot,
 		bool uses_variadic_placeholder) {
 
 	if (EXPECTED(function->type == ZEND_INTERNAL_FUNCTION
@@ -1051,11 +1051,11 @@ static const zend_op_array *zp_get_op_array(zval *this_ptr, zend_function *funct
 	}
 
 	const zend_op_array *op_array = zend_accel_pfa_cache_get(declaring_op_array,
-			declaring_opline, function);
+			declaring_lineno_ptr, function);
 
 	if (UNEXPECTED(!op_array)) {
 		op_array = zp_compile(this_ptr, function, argc, argv,
-			extra_named_params, named_positions, declaring_op_array, declaring_opline,
+			extra_named_params, named_positions, declaring_op_array, declaring_lineno_ptr,
 			cache_slot, uses_variadic_placeholder);
 	}
 
@@ -1121,12 +1121,12 @@ void zend_partial_create(zval *result, zval *this_ptr, zend_function *function,
 		uint32_t argc, zval *argv, zend_array *extra_named_params,
 		const zend_array *named_positions,
 		const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline, void **cache_slot,
+		const uint32_t *declaring_lineno_ptr, void **cache_slot,
 		bool uses_variadic_placeholder) {
 
 	const zend_op_array *op_array = zp_get_op_array(this_ptr, function, argc, argv,
 			extra_named_params, named_positions,
-			declaring_op_array, declaring_opline,
+			declaring_op_array, declaring_lineno_ptr,
 			cache_slot, uses_variadic_placeholder);
 
 	if (UNEXPECTED(!op_array)) {

Zend/zend_partial.h

@@ -21,11 +21,14 @@
 
 BEGIN_EXTERN_C()
 
+/* Create a partial application of 'function'
+ * 'declaring_op_array' and 'declaring_lineno_ptr' are used to build a cache key.
+ * The latter should be a pointer to a zend_op.lineno or a zend_ast.lineno. */
 void zend_partial_create(zval *result, zval *this_ptr, zend_function *function,
 		uint32_t argc, zval *argv, zend_array *extra_named_params,
 		const zend_array *named_positions,
 		const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline, void **cache_slot,
+		const uint32_t *declaring_lineno_ptr, void **cache_slot,
 		bool uses_variadic_placeholder);
 
 void zend_partial_op_array_dtor(zval *pDest);

Zend/zend_vm_def.h

@@ -9881,7 +9881,7 @@ ZEND_VM_HANDLER(212, ZEND_CALLABLE_CONVERT_PARTIAL, CACHE_SLOT, CONST|UNUSED, NU
 		(ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) ?
 			call->extra_named_params : NULL,
 		OP2_TYPE == IS_CONST ? Z_ARRVAL_P(named_positions) : NULL,
-		&EX(func)->op_array, opline, cache_slot,
+		&EX(func)->op_array, &opline->lineno, cache_slot,
 		opline->extended_value & ZEND_FCALL_USES_VARIADIC_PLACEHOLDER);
 
 	if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {

Zend/zend_vm_execute.h

@@ -2024,15 +2024,15 @@ static char *zend_accel_uintptr_hex(char *dest, uintptr_t n)
  * a scheme, except file:// and phar://. */
 #define PFA_KEY_PREFIX "pfa://"
 
-static zend_string *zend_accel_pfa_key(const zend_op *declaring_opline,
+static zend_string *zend_accel_pfa_key(const uint32_t *declaring_lineno_ptr,
 		const zend_function *called_function)
 {
 	const size_t max_key_len = strlen(PFA_KEY_PREFIX) + (sizeof(uintptr_t)*2) + strlen(":") + (sizeof(uintptr_t)*2);
 	zend_string *key = zend_string_alloc(max_key_len, 0);
 
 	char *dest = ZSTR_VAL(key);
 	dest = zend_mempcpy(dest, PFA_KEY_PREFIX, strlen(PFA_KEY_PREFIX));
-	dest = zend_accel_uintptr_hex(dest, (uintptr_t)declaring_opline);
+	dest = zend_accel_uintptr_hex(dest, (uintptr_t)declaring_lineno_ptr);
 	*dest++ = ':';
 
 	const void *ptr;
@@ -2055,9 +2055,9 @@ static zend_string *zend_accel_pfa_key(const zend_op *declaring_opline,
 }
 
 const zend_op_array *zend_accel_pfa_cache_get(const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline, const zend_function *called_function)
+		const uint32_t *declaring_lineno_ptr, const zend_function *called_function)
 {
-	zend_string *key = zend_accel_pfa_key(declaring_opline, called_function);
+	zend_string *key = zend_accel_pfa_key(declaring_lineno_ptr, called_function);
 	zend_op_array *op_array = NULL;
 
 	/* A PFA is SHM-cacheable if the declaring_op_array and called_function are
@@ -2085,7 +2085,7 @@ const zend_op_array *zend_accel_pfa_cache_get(const zend_op_array *declaring_op_
 
 zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 		const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline,
+		const uint32_t *declaring_lineno_ptr,
 		const zend_function *called_function,
 		zend_string *pfa_func_name)
 {
@@ -2121,7 +2121,7 @@ zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 	zend_string_release(op_array->dynamic_func_defs[0]->function_name);
 	op_array->dynamic_func_defs[0]->function_name = pfa_func_name;
 
-	zend_string *key = zend_accel_pfa_key(declaring_opline, called_function);
+	zend_string *key = zend_accel_pfa_key(declaring_lineno_ptr, called_function);
 
 	/* Cache op_array only if the declaring op_array and the called function
 	 * are cached */

ext/opcache/ZendAccelerator.c

@@ -335,12 +335,12 @@ zend_string* ZEND_FASTCALL accel_new_interned_string(zend_string *str);
 uint32_t zend_accel_get_class_name_map_ptr(zend_string *type_name);
 
 const zend_op_array *zend_accel_pfa_cache_get(const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline,
+		const uint32_t *declaring_lineno_ptr,
 		const zend_function *called_function);
 
 zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 		const zend_op_array *declaring_op_array,
-		const zend_op *declaring_opline,
+		const uint32_t *declaring_lineno_ptr,
 		const zend_function *called_function,
 		zend_string *pfa_func_name);