Free extra named args in jit

nikic · nikic · commit d46b587d8a1b · 2020-07-27T18:42:00.000+02:00
diff --git a/Zend/tests/named_params/internal.phpt b/Zend/tests/named_params/internal.phpt
@@ -8,6 +8,7 @@ var_dump(array_slice(length: 2, offset: 2, arg: [1, 2, 3, 4, 5]));
 
 var_dump(array_slice(arg: ['a' => 0, 'b' => 1], offset: 1, preserve_keys: true));
 var_dump(array_slice(['a' => 0, 'b' => 1], preserve_keys: true, offset: 1));
+var_dump(str_pad("foo", 6, pad_type: STR_PAD_LEFT));
 
 // Named params work with specialized functions.
 var_dump(strlen(string: 'foo'));
@@ -34,4 +35,5 @@ array(1) {
   ["b"]=>
   int(1)
 }
+string(6) "   foo"
 int(3)
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -92,6 +92,9 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_leave_top_func_helper(uint32_t ca
 		}
 		zend_vm_stack_free_extra_args_ex(call_info, execute_data);
 	}
+	if (UNEXPECTED(call_info & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) {
+		zend_array_destroy(EX(extra_named_params));
+	}
 	if (UNEXPECTED(call_info & ZEND_CALL_CLOSURE)) {
 		OBJ_RELEASE(ZEND_CLOSURE_OBJECT(EX(func)));
 	}
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -8558,6 +8558,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 #endif
 	}
 
+	// TODO: This could be more precise by checking MAY_BE_ARRAY_KEY_STRING for unpacks.
 	bool may_have_named_args = 0;
 	if ((opline-1)->opcode == ZEND_SEND_UNPACK || (opline-1)->opcode == ZEND_SEND_ARRAY ||
 			opline->extended_value == ZEND_FCALL_HAS_NAMED_ARGS) {
@@ -8870,6 +8871,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 			|	mov ecx, dword [FP + offsetof(zend_execute_data, This.u2.num_args)] // reload
 			|	jmp >1
 			|.code
+			// TODO: Emit ZEND_CALL_MAY_HAVE_UNDEF check for named args.
 			if (!may_have_named_args &&
 					(!func || (func->op_array.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) == 0)) {
 				if (!func) {
@@ -9020,6 +9022,17 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 			|	mov FCARG1a, RX
 			|	EXT_CALL zend_jit_vm_stack_free_args_helper, r0
 		}
+		if (may_have_named_args) {
+			|	test byte [RX + offsetof(zend_execute_data, This.u1.type_info) + 3], (ZEND_CALL_HAS_EXTRA_NAMED_PARAMS >> 24)
+			|	jnz >1
+			|1:
+			|.cold_code
+			|	mov FCARG1a, aword [RX + offsetof(zend_execute_data, extra_named_params)]
+			|	EXT_CALL zend_array_destroy, r0
+			|	jmp >2
+			|.code
+			|2:
+		}
 
 		|8:
 		if (opline->opcode == ZEND_DO_FCALL) {

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_leave_top_func_helper(uint32_t ca`
`92`	`92`	`}`
`93`	`93`	`zend_vm_stack_free_extra_args_ex(call_info, execute_data);`
`94`	`94`	`}`
	`95`	`+ if (UNEXPECTED(call_info & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) {`
	`96`	`+ zend_array_destroy(EX(extra_named_params));`
	`97`	`+ }`
`95`	`98`	`if (UNEXPECTED(call_info & ZEND_CALL_CLOSURE)) {`
`96`	`99`	`OBJ_RELEASE(ZEND_CLOSURE_OBJECT(EX(func)));`
`97`	`100`	`}`