Fix some opcache issues

Support is definitely incomplete.

Author: nikic

Zend/tests/named_params/missing_param.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Require parameter not passed
+Required parameter not passed
 --FILE--
 <?php
 

Zend/tests/named_params/unpack.phpt

@@ -70,6 +70,7 @@ array(1) {
 }
 a = a, b = b, c = c
 a = a, b = b, c = c
+a = a, b = b, c = c
 Cannot use positional argument after named argument during unpacking
 Named parameter $a overwrites previous argument
 

Zend/zend_vm_def.h

@@ -5289,7 +5289,7 @@ ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_RECV, op->op2.num == MAY_BE_ANY, ZEND_RECV_NO
 	USE_OPLINE
 	uint32_t arg_num = opline->op1.num;
 
-	if (UNEXPECTED(arg_num > EX_NUM_ARGS())) {
+	if (UNEXPECTED(arg_num > EX_NUM_ARGS()) || Z_ISUNDEF_P(EX_VAR(opline->result.var))) {
 		ZEND_VM_DISPATCH_TO_HELPER(zend_missing_arg_helper, arg_num, arg_num);
 	}
 

Zend/zend_vm_execute.h

@@ -2188,7 +2188,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_RECV_NOTYPE_SPEC_H
 	USE_OPLINE
 	uint32_t arg_num = opline->op1.num;
 
-	if (UNEXPECTED(arg_num > EX_NUM_ARGS())) {
+	if (UNEXPECTED(arg_num > EX_NUM_ARGS()) || Z_ISUNDEF_P(EX_VAR(opline->result.var))) {
 		ZEND_VM_TAIL_CALL(zend_missing_arg_helper_SPEC(arg_num ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC));
 	}
 

ext/opcache/Optimizer/compact_literals.c

@@ -779,6 +779,20 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
 					opline->extended_value = cache_size;
 					cache_size += sizeof(void *);
 					break;
+				case ZEND_SEND_VAL:
+				case ZEND_SEND_VAL_EX:
+				case ZEND_SEND_VAR:
+				case ZEND_SEND_VAR_EX:
+				case ZEND_SEND_VAR_NO_REF:
+				case ZEND_SEND_VAR_NO_REF_EX:
+				case ZEND_SEND_REF:
+				case ZEND_SEND_FUNC_ARG:
+				case ZEND_CHECK_FUNC_ARG:
+					if (opline->op2_type == IS_CONST) {
+						opline->result.num = cache_size;
+						cache_size += 2 * sizeof(void *);
+					}
+					break;
 			}
 			opline++;
 		}

ext/opcache/Optimizer/optimize_func_calls.c

@@ -257,6 +257,11 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 				break;
 			case ZEND_SEND_VAL_EX:
 				if (call_stack[call - 1].func) {
+					if (opline->op2_type == IS_CONST) {
+						call_stack[call - 1].try_inline = 0;
+						break;
+					}
+
 					if (ARG_MUST_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
 						/* We won't convert it into_DO_FCALL to emit error at run-time */
 						call_stack[call - 1].opline = NULL;
@@ -267,13 +272,23 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 				break;
 			case ZEND_CHECK_FUNC_ARG:
 				if (call_stack[call - 1].func) {
+					if (opline->op2_type == IS_CONST) {
+						call_stack[call - 1].try_inline = 0;
+						break;
+					}
+
 					call_stack[call - 1].func_arg_num = opline->op2.num;
 					MAKE_NOP(opline);
 				}
 				break;
 			case ZEND_SEND_VAR_EX:
 			case ZEND_SEND_FUNC_ARG:
 				if (call_stack[call - 1].func) {
+					if (opline->op2_type == IS_CONST) {
+						call_stack[call - 1].try_inline = 0;
+						break;
+					}
+
 					call_stack[call - 1].func_arg_num = (uint32_t)-1;
 					if (ARG_SHOULD_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
 						opline->opcode = ZEND_SEND_REF;
@@ -284,6 +299,11 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 				break;
 			case ZEND_SEND_VAR_NO_REF_EX:
 				if (call_stack[call - 1].func) {
+					if (opline->op2_type == IS_CONST) {
+						call_stack[call - 1].try_inline = 0;
+						break;
+					}
+
 					if (ARG_MUST_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
 						opline->opcode = ZEND_SEND_VAR_NO_REF;
 					} else if (ARG_MAY_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
@@ -293,6 +313,14 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 					}
 				}
 				break;
+			case ZEND_SEND_VAL:
+			case ZEND_SEND_VAR:
+			case ZEND_SEND_REF:
+				if (opline->op2_type == IS_CONST) {
+					call_stack[call - 1].try_inline = 0;
+					break;
+				}
+				break;
 			case ZEND_SEND_UNPACK:
 			case ZEND_SEND_USER:
 			case ZEND_SEND_ARRAY:

ext/opcache/Optimizer/zend_call_graph.c

@@ -126,8 +126,12 @@ int zend_analyze_calls(zend_arena **arena, zend_script *script, uint32_t build_f
 			case ZEND_SEND_VAR_NO_REF_EX:
 			case ZEND_SEND_USER:
 				if (call_info) {
-					uint32_t num = opline->op2.num;
+					if (opline->op2_type == IS_CONST) {
+						call_info->named_args = 1;
+						break;
+					}
 
+					uint32_t num = opline->op2.num;
 					if (num > 0) {
 						num--;
 					}

ext/opcache/Optimizer/zend_call_graph.h

@@ -42,6 +42,7 @@ struct _zend_call_info {
 	zend_func_info         *clone;
 	zend_bool               recursive;
 	zend_bool               send_unpack;  /* Parameters passed by SEND_UNPACK or SEND_ARRAY */
+	zend_bool               named_args;   /* Function has named arguments */
 	int                     num_args;
 	zend_send_arg_info      arg_info[1];
 };