Re-use trampoline call frame, use an opcode-based trampoline

Like __call trampolines, we can use an opcode-based trampoline to reduce
recursion/reentering, and reuse the call frame of the trampoline.

Also: Rebase fixes, update tests, add tests.

Author: arnaud-lb

Zend/Optimizer/compact_literals.c

@@ -734,6 +734,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
 				case ZEND_SEND_VAR_NO_REF_EX:
 				case ZEND_SEND_REF:
 				case ZEND_SEND_FUNC_ARG:
+				case ZEND_SEND_PLACEHOLDER:
 				case ZEND_CHECK_FUNC_ARG:
 					if (opline->op2_type == IS_CONST) {
 						opline->result.num = cache_size;

Zend/Optimizer/optimize_func_calls.c

@@ -193,6 +193,7 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 			case ZEND_DO_UCALL:
 			case ZEND_DO_FCALL_BY_NAME:
 			case ZEND_CALLABLE_CONVERT:
+			case ZEND_CALLABLE_CONVERT_PARTIAL:
 				call--;
 				if (call_stack[call].func && call_stack[call].opline) {
 					zend_op *fcall = call_stack[call].opline;
@@ -225,13 +226,14 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 					 * At this point we also know whether or not the result of
 					 * the DO opcode is used, allowing to optimize calls to
 					 * ZEND_ACC_NODISCARD functions. */
-					if (opline->opcode != ZEND_CALLABLE_CONVERT) {
+					if (opline->opcode != ZEND_CALLABLE_CONVERT && opline->opcode != ZEND_CALLABLE_CONVERT_PARTIAL) {
 						opline->opcode = zend_get_call_op(fcall, call_stack[call].func, !RESULT_UNUSED(opline));
 					}
 
 					if ((ZEND_OPTIMIZER_PASS_16 & ctx->optimization_level)
 							&& call_stack[call].try_inline
-							&& opline->opcode != ZEND_CALLABLE_CONVERT) {
+							&& opline->opcode != ZEND_CALLABLE_CONVERT
+							&& opline->opcode != ZEND_CALLABLE_CONVERT_PARTIAL) {
 						zend_try_inline_call(op_array, fcall, opline, call_stack[call].func);
 					}
 				}

Zend/Optimizer/zend_call_graph.c

@@ -128,7 +128,7 @@ ZEND_API void zend_analyze_calls(zend_arena **arena, zend_script *script, uint32
 			case ZEND_DO_UCALL:
 			case ZEND_DO_FCALL_BY_NAME:
 			case ZEND_CALLABLE_CONVERT:
-			case ZEND_DO_FCALL_PARTIAL:
+			case ZEND_CALLABLE_CONVERT_PARTIAL:
 				func_info->flags |= ZEND_FUNC_HAS_CALLS;
 				if (call_info) {
 					call_info->caller_call_opline = opline;

Zend/Optimizer/zend_inference.c

@@ -3901,6 +3901,7 @@ static zend_always_inline zend_result _zend_update_type_info(
 			}
 			break;
 		case ZEND_CALLABLE_CONVERT:
+		case ZEND_CALLABLE_CONVERT_PARTIAL:
 			UPDATE_SSA_TYPE(MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN, ssa_op->result_def);
 			UPDATE_SSA_OBJ_TYPE(zend_ce_closure, /* is_instanceof */ false, ssa_op->result_def);
 			break;

Zend/tests/partial_application/compile_errors_003.phpt

@@ -5,5 +5,5 @@ Partial application compile errors: named arguments must come after placeholder
 foo(n: 5, ?);
 ?>
 --EXPECTF--
-Fatal error: Named arguments must come after all placeholders in %s on line %d
+Fatal error: Cannot use positional argument after named argument in %s on line %d
 

Zend/tests/partial_application/compile_errors_004.phpt

@@ -5,4 +5,4 @@ Partial application compile errors: named arguments must come after variadic pla
 foo(n: 5, ...);
 ?>
 --EXPECTF--
-Fatal error: Named arguments must come after all placeholders in %s on line %d
+Fatal error: Cannot use positional argument after named argument in %s on line %d

Zend/tests/partial_application/compile_errors_006.phpt

@@ -5,5 +5,5 @@ Partial application compile errors: mix application with unpack (placeholder aft
 foo(...["foo" => "bar"], ...);
 ?>
 --EXPECTF--
-Fatal error: Cannot combine partial application and unpacking %s on line %d
+Fatal error: Cannot use positional argument after argument unpacking %s on line %d
 

Zend/tests/partial_application/errors_003.phpt

@@ -19,7 +19,7 @@ try {
 $foo = foo(?, ?);
 
 try {
-    $foo(1);    
+    $foo(1);
 } catch (Error $ex) {
     printf("%s\n", $ex->getMessage());
 }
@@ -46,10 +46,10 @@ try {
     printf("%s\n", $ex->getMessage());
 }
 
-$usleep = usleep(...);
+$repeat = str_repeat('a', ...);
 
 try {
-    $usleep();
+    $repeat();
 } catch (Error $ex) {
     printf("%s\n", $ex->getMessage());
 }
@@ -71,8 +71,8 @@ try {
 --EXPECTF--
 not enough arguments for application of foo, 0 given and exactly 1 expected, declared in %s on line 8
 not enough arguments for application of foo, 1 given and exactly 2 expected, declared in %s on line 16
-not enough arguments for application of bar, 1 given and at least 2 expected, declared in %s on line 24
+not enough arguments for application of bar, 1 given and at least 3 expected, declared in %s on line 24
 not enough arguments for application of Foo::bar, 0 given and exactly 1 expected, declared in %s on line 38
-not enough arguments for implementation of usleep, 0 given and exactly 1 expected
-not enough arguments for application of usleep, 0 given and exactly 1 expected
-too many arguments for application of usleep, 2 given and a maximum of 1 expected
+not enough arguments for application of str_repeat, 0 given and at least 1 expected, declared in %s on line 46
+not enough arguments for application of usleep, 0 given and exactly 1 expected, declared in %s on line 54
+too many arguments for application of usleep, 2 given and a maximum of 1 expected, declared in %s on line 54

Zend/tests/partial_application/export_001.phpt

@@ -5,10 +5,10 @@ assert.exception=1
 --FILE--
 <?php
 try {
-    assert(0 && foo(?) && foo(...));
+    assert(0 && foo(?) && foo(new stdClass, ...));
 } catch (Error $ex) {
     printf("%s\n", $ex->getMessage());
 }
 ?>
 --EXPECT--
-assert(0 && foo(?) && foo(...))
+assert(0 && foo(?) && foo(new stdClass(), ...))