Avoid exception check unless zval_undefined_cv is called

These functions are inlined anyway, so we're only sacrificing readability.

Author: iluuu1994

Zend/zend_vm_def.h

@@ -9562,11 +9562,24 @@ ZEND_VM_HANDLER(205, ZEND_FRAMELESS_ICALL_1, CONST|TMP|VAR|CV, UNUSED)
 	USE_OPLINE
 	SAVE_OPLINE();
 	zend_frameless_function_1 function = (zend_frameless_function_1)zend_flf_handlers[opline->extended_value];
-	zval *arg1 = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
-	if (OP1_TYPE == IS_CV && EG(exception)) {
-		ZVAL_NULL(EX_VAR(opline->result.var));
-		HANDLE_EXCEPTION();
+
+	zval *arg1;
+	if (OP1_TYPE == IS_CV) {
+		/* Inlined GET_OPx_ZVAL_PTR_DEREF to nest the EG(exception) check. */
+		arg1 = EX_VAR(opline->op1.var);
+		if (UNEXPECTED(Z_TYPE_P(arg1) == IS_UNDEF)) {
+			arg1 = zval_undefined_cv(opline->op1.var EXECUTE_DATA_CC);
+			if (EG(exception)) {
+				ZVAL_NULL(EX_VAR(opline->result.var));
+				FREE_OP1();
+				HANDLE_EXCEPTION();
+			}
+		}
+		ZVAL_DEREF(arg1);
+	} else {
+		arg1 = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 	}
+
 	function(EX_VAR(opline->result.var), arg1);
 	FREE_OP1();
 	if (EG(exception)) {
@@ -9581,12 +9594,43 @@ ZEND_VM_HANDLER(206, ZEND_FRAMELESS_ICALL_2, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
 	USE_OPLINE
 	SAVE_OPLINE();
 	zend_frameless_function_2 function = (zend_frameless_function_2)zend_flf_handlers[opline->extended_value];
-	zval *arg1 = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
-	zval *arg2 = GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R);
-	if ((OP1_TYPE == IS_CV || OP2_TYPE == IS_CV) && EG(exception)) {
-		ZVAL_NULL(EX_VAR(opline->result.var));
-		HANDLE_EXCEPTION();
+
+	zval *arg1;
+	if (OP1_TYPE == IS_CV) {
+		/* Inlined GET_OPx_ZVAL_PTR_DEREF to nest the EG(exception) check. */
+		arg1 = EX_VAR(opline->op1.var);
+		if (UNEXPECTED(Z_TYPE_P(arg1) == IS_UNDEF)) {
+			arg1 = zval_undefined_cv(opline->op1.var EXECUTE_DATA_CC);
+			if (EG(exception)) {
+				ZVAL_NULL(EX_VAR(opline->result.var));
+				FREE_OP1();
+				FREE_OP2();
+				HANDLE_EXCEPTION();
+			}
+		}
+		ZVAL_DEREF(arg1);
+	} else {
+		arg1 = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 	}
+
+	zval *arg2;
+	if (OP2_TYPE == IS_CV) {
+		/* Inlined GET_OPx_ZVAL_PTR_DEREF to nest the EG(exception) check. */
+		arg2 = EX_VAR(opline->op2.var);
+		if (UNEXPECTED(Z_TYPE_P(arg2) == IS_UNDEF)) {
+			arg2 = zval_undefined_cv(opline->op2.var EXECUTE_DATA_CC);
+			if (EG(exception)) {
+				ZVAL_NULL(EX_VAR(opline->result.var));
+				FREE_OP1();
+				FREE_OP2();
+				HANDLE_EXCEPTION();
+			}
+		}
+		ZVAL_DEREF(arg2);
+	} else {
+		arg2 = GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R);
+	}
+
 	function(EX_VAR(opline->result.var), arg1, arg2);
 	FREE_OP1();
 	FREE_OP2();
@@ -9607,6 +9651,9 @@ ZEND_VM_HANDLER(207, ZEND_FRAMELESS_ICALL_3, ANY, ANY)
 	zval *arg3 = GET_OP_DATA_ZVAL_PTR_DEREF(BP_VAR_R);
 	if (EG(exception)) {
 		ZVAL_NULL(EX_VAR(opline->result.var));
+		FREE_OP1();
+		FREE_OP2();
+		FREE_OP_DATA();
 		HANDLE_EXCEPTION();
 	}
 	function(EX_VAR(opline->result.var), arg1, arg2, arg3);