Rename opcode to be more precise

This opcode is only needed if there are undef args and may be
dropped otherwise (even though there are named args).

Author: nikic

Zend/zend_compile.c

@@ -3489,7 +3489,7 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */
 	}
 
 	if (may_have_undef) {
-		zend_emit_op(NULL, ZEND_CHECK_NAMED, NULL, NULL);
+		zend_emit_op(NULL, ZEND_CHECK_UNDEF_ARGS, NULL, NULL);
 	}
 
 	return arg_count;
@@ -3875,7 +3875,7 @@ int zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcna
 	}
 	zend_compile_expr(&arg_node, args->child[1]);
 	zend_emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL);
-	zend_emit_op(NULL, ZEND_CHECK_NAMED, NULL, NULL);
+	zend_emit_op(NULL, ZEND_CHECK_UNDEF_ARGS, NULL, NULL);
 	zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL);
 
 	return SUCCESS;

Zend/zend_execute.c

@@ -3790,7 +3790,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
 						break;
 					case ZEND_SEND_ARRAY:
 					case ZEND_SEND_UNPACK:
-					case ZEND_CHECK_NAMED:
+					case ZEND_CHECK_UNDEF_ARGS:
 						if (level == 0) {
 							do_exit = 1;
 						}

Zend/zend_vm_def.h

@@ -5274,7 +5274,7 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, CONST|TMP|VAR|CV, NUM)
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }
 
-ZEND_VM_HOT_HANDLER(199, ZEND_CHECK_NAMED, UNUSED, UNUSED)
+ZEND_VM_HOT_HANDLER(199, ZEND_CHECK_UNDEF_ARGS, UNUSED, UNUSED)
 {
 	USE_OPLINE
 

Zend/zend_vm_execute.h

@@ -34093,7 +34093,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CHECK_FUNC_ARG_SPE
 	ZEND_VM_NEXT_OPCODE();
 }
 
-static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CHECK_NAMED_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CHECK_UNDEF_ARGS_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 	USE_OPLINE
 
@@ -52359,7 +52359,7 @@ ZEND_API void execute_ex(zend_execute_data *ex)
 			(void*)&&ZEND_JMP_NULL_SPEC_TMPVARCV_LABEL,
 			(void*)&&ZEND_NULL_LABEL,
 			(void*)&&ZEND_JMP_NULL_SPEC_TMPVARCV_LABEL,
-			(void*)&&ZEND_CHECK_NAMED_SPEC_UNUSED_UNUSED_LABEL,
+			(void*)&&ZEND_CHECK_UNDEF_ARGS_SPEC_UNUSED_UNUSED_LABEL,
 			(void*)&&ZEND_RECV_NOTYPE_SPEC_LABEL,
 			(void*)&&ZEND_JMP_FORWARD_SPEC_LABEL,
 			(void*)&&ZEND_NULL_LABEL,
@@ -56421,9 +56421,9 @@ ZEND_API void execute_ex(zend_execute_data *ex)
 				VM_TRACE(ZEND_CHECK_FUNC_ARG_SPEC_UNUSED_UNUSED_QUICK)
 				ZEND_CHECK_FUNC_ARG_SPEC_UNUSED_UNUSED_QUICK_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 				HYBRID_BREAK();
-			HYBRID_CASE(ZEND_CHECK_NAMED_SPEC_UNUSED_UNUSED):
-				VM_TRACE(ZEND_CHECK_NAMED_SPEC_UNUSED_UNUSED)
-				ZEND_CHECK_NAMED_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
+			HYBRID_CASE(ZEND_CHECK_UNDEF_ARGS_SPEC_UNUSED_UNUSED):
+				VM_TRACE(ZEND_CHECK_UNDEF_ARGS_SPEC_UNUSED_UNUSED)
+				ZEND_CHECK_UNDEF_ARGS_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 				HYBRID_BREAK();
 			HYBRID_CASE(ZEND_NEW_SPEC_UNUSED_UNUSED):
 				VM_TRACE(ZEND_NEW_SPEC_UNUSED_UNUSED)
@@ -60231,7 +60231,7 @@ void zend_vm_init(void)
 		ZEND_JMP_NULL_SPEC_TMPVARCV_HANDLER,
 		ZEND_NULL_HANDLER,
 		ZEND_JMP_NULL_SPEC_TMPVARCV_HANDLER,
-		ZEND_CHECK_NAMED_SPEC_UNUSED_UNUSED_HANDLER,
+		ZEND_CHECK_UNDEF_ARGS_SPEC_UNUSED_UNUSED_HANDLER,
 		ZEND_RECV_NOTYPE_SPEC_HANDLER,
 		ZEND_JMP_FORWARD_SPEC_HANDLER,
 		ZEND_NULL_HANDLER,

Zend/zend_vm_handlers.h

@@ -1328,7 +1328,7 @@
 	_(2515, ZEND_JMP_NULL_SPEC_TMPVARCV) \
 	_(2516, ZEND_JMP_NULL_SPEC_TMPVARCV) \
 	_(2518, ZEND_JMP_NULL_SPEC_TMPVARCV) \
-	_(2519, ZEND_CHECK_NAMED_SPEC_UNUSED_UNUSED) \
+	_(2519, ZEND_CHECK_UNDEF_ARGS_SPEC_UNUSED_UNUSED) \
 	_(2520, ZEND_RECV_NOTYPE_SPEC) \
 	_(2521, ZEND_JMP_FORWARD_SPEC) \
 	_(2527, ZEND_ADD_LONG_NO_OVERFLOW_SPEC_TMPVARCV_CONST) \

Zend/zend_vm_opcodes.c

@@ -222,7 +222,7 @@ static const char *zend_vm_opcodes_names[200] = {
 	"ZEND_CASE_STRICT",
 	"ZEND_MATCH_ERROR",
 	"ZEND_JMP_NULL",
-	"ZEND_CHECK_NAMED",
+	"ZEND_CHECK_UNDEF_ARGS",
 };
 
 static uint32_t zend_vm_opcodes_flags[200] = {

Zend/zend_vm_opcodes.h

@@ -275,7 +275,7 @@ END_EXTERN_C()
 #define ZEND_CASE_STRICT                196
 #define ZEND_MATCH_ERROR                197
 #define ZEND_JMP_NULL                   198
-#define ZEND_CHECK_NAMED                199
+#define ZEND_CHECK_UNDEF_ARGS           199
 
 #define ZEND_VM_LAST_OPCODE             199
 

ext/opcache/jit/zend_jit.c

@@ -2583,7 +2583,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 							goto jit_failure;
 						}
 						goto done;
-					case ZEND_CHECK_NAMED:
+					case ZEND_CHECK_UNDEF_ARGS:
 						if (!zend_jit_check_named(&dasm_state, opline)) {
 							goto jit_failure;
 						}

ext/opcache/jit/zend_jit_trace.c

@@ -3635,7 +3635,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							goto jit_failure;
 						}
 						goto done;
-					case ZEND_CHECK_NAMED:
+					case ZEND_CHECK_UNDEF_ARGS:
 						if (!zend_jit_check_named(&dasm_state, opline)) {
 							goto jit_failure;
 						}

ext/opcache/jit/zend_jit_x86.dasc

@@ -8571,7 +8571,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 	// TODO: Clean this up.
 	bool may_have_named_args = 0;
 	if ((opline-1)->opcode == ZEND_SEND_UNPACK || (opline-1)->opcode == ZEND_SEND_ARRAY ||
-			(opline-1)->opcode == ZEND_CHECK_NAMED ||
+			(opline-1)->opcode == ZEND_CHECK_UNDEF_ARGS ||
 			opline->extended_value == ZEND_FCALL_HAS_NAMED_ARGS) {
 		unknown_num_args = 1;
 		may_have_named_args = 1;