Remove ZEND_SEND_EXPLICIT_VAL

Author: iluuu1994

Zend/Optimizer/optimize_func_calls.c

@@ -347,17 +347,6 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 					}
 				}
 				break;
-			case ZEND_SEND_EXPLICIT_VAL:
-				if (call_stack[call - 1].func) {
-					if (!ARG_MUST_BE_SENT_BY_REF(call_stack[call - 1].func, opline->op2.num)) {
-						if (opline->op1_type & (IS_CONST|IS_TMP_VAR)) {
-							opline->opcode = ZEND_SEND_VAL;
-						} else {
-							opline->opcode = ZEND_SEND_VAR;
-						}
-					}
-				}
-				break;
 			case ZEND_SEND_UNPACK:
 			case ZEND_SEND_USER:
 			case ZEND_SEND_ARRAY:

Zend/Optimizer/zend_call_graph.c

@@ -139,7 +139,6 @@ ZEND_API void zend_analyze_calls(zend_arena **arena, zend_script *script, uint32
 			case ZEND_SEND_VAR_EX:
 			case ZEND_SEND_FUNC_ARG:
 			case ZEND_SEND_REF:
-			case ZEND_SEND_EXPLICIT_VAL:
 			case ZEND_SEND_EXPLICIT_REF:
 			case ZEND_SEND_EXPLICIT_REF_FUNC:
 			case ZEND_SEND_VAR_NO_REF:

Zend/tests/explicitSendByRef/requiredExplicitSendByRef.phpt

@@ -388,7 +388,6 @@ void zend_file_context_begin(zend_file_context *prev_context) /* {{{ */
 	FC(in_namespace) = 0;
 	FC(has_bracketed_namespaces) = 0;
 	FC(declarables).ticks = 0;
-	FC(declarables).require_explicit_send_by_ref = 0;
 	zend_hash_init(&FC(seen_symbols), 8, NULL, NULL, 0);
 }
 /* }}} */
@@ -3769,20 +3768,6 @@ static uint32_t zend_compile_args(
 			} else {
 				opcode = fbc ? ZEND_SEND_REF : ZEND_SEND_EXPLICIT_REF;
 			}
-		} else if (FC(declarables).require_explicit_send_by_ref) {
-			zend_compile_expr(&arg_node, arg);
-			if (fbc) {
-				if (ARG_MUST_BE_SENT_BY_REF(fbc, arg_num)) {
-					/* Delay error until runtime */
-					opcode = ZEND_SEND_EXPLICIT_VAL;
-				} else if (arg_node.op_type & (IS_CONST|IS_TMP_VAR)) {
-					opcode = ZEND_SEND_VAL;
-				} else {
-					opcode = ZEND_SEND_VAR;
-				}
-			} else {
-				opcode = ZEND_SEND_EXPLICIT_VAL;
-			}
 		} else if (zend_is_call(arg) || is_globals_fetch(arg)) {
 			/* Treat passing of $GLOBALS the same as passing a call.
 			 * This will error at runtime if the argument is by-ref. */
@@ -6617,15 +6602,6 @@ static void zend_compile_declare(zend_ast *ast) /* {{{ */
 			if (Z_LVAL(value_zv) == 1) {
 				CG(active_op_array)->fn_flags |= ZEND_ACC_STRICT_TYPES;
 			}
-		} else if (zend_string_equals_literal_ci(name, "require_explicit_send_by_ref")) {
-			zval value_zv;
-			zend_const_expr_to_zval(&value_zv, value_ast_ptr, /* allow_dynamic */ false);
-			if (Z_TYPE(value_zv) != IS_LONG || (Z_LVAL(value_zv) != 0 && Z_LVAL(value_zv) != 1)) {
-				zend_error_noreturn(E_COMPILE_ERROR,
-					"require_explicit_send_by_ref declaration must have 0 or 1 as its value");
-			}
-
-			FC(declarables).require_explicit_send_by_ref = Z_LVAL(value_zv);
 		} else {
 			zend_error(E_COMPILE_WARNING, "Unsupported declare '%s'", ZSTR_VAL(name));
 		}

Zend/zend_compile.c

@@ -103,7 +103,6 @@ static zend_always_inline znode *zend_ast_get_znode(zend_ast *ast) {
 
 typedef struct _zend_declarables {
 	zend_long ticks;
-	bool require_explicit_send_by_ref;
 } zend_declarables;
 
 /* Compilation context that is different for each file, but shared between op arrays. */

Zend/zend_compile.h

@@ -4394,7 +4394,6 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
 					case ZEND_SEND_VAR_NO_REF:
 					case ZEND_SEND_VAR_NO_REF_EX:
 					case ZEND_SEND_USER:
-					case ZEND_SEND_EXPLICIT_VAL:
 					case ZEND_SEND_EXPLICIT_REF:
 					case ZEND_SEND_EXPLICIT_REF_FUNC:
 						if (level == 0) {

Zend/zend_execute.c

@@ -5027,57 +5027,6 @@ ZEND_VM_C_LABEL(invalid_send_ref):
 	ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(211, ZEND_SEND_EXPLICIT_VAL, CONST|TMP|VAR|CV, NUM, SPEC(QUICK_ARG))
-{
-	USE_OPLINE
-	zval *value, *arg;
-	uint32_t arg_num = opline->op2.num;
-
-	arg = ZEND_CALL_VAR(EX(call), opline->result.var);
-
-	if (EXPECTED(arg_num <= MAX_ARG_FLAG_NUM)) {
-		if (QUICK_ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num)) {
-			ZEND_VM_DISPATCH_TO_HELPER(zend_cannot_pass_by_ref_helper, _arg_num, arg_num, _arg, arg);
-		}
-	} else if (ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num)) {
-		ZEND_VM_DISPATCH_TO_HELPER(zend_cannot_pass_by_ref_helper, _arg_num, arg_num, _arg, arg);
-	}
-
-	value = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);
-	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_INFO_P(value) == IS_UNDEF)) {
-		SAVE_OPLINE();
-		ZVAL_UNDEFINED_OP1();
-		ZVAL_NULL(arg);
-		ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
-	}
-
-	if (OP1_TYPE == IS_CV) {
-		ZVAL_COPY_DEREF(arg, value);
-	} else if (OP1_TYPE == IS_TMP_VAR) {
-		ZVAL_COPY_VALUE(arg, value);
-	} else if (OP1_TYPE == IS_VAR) {
-		if (UNEXPECTED(Z_ISREF_P(value))) {
-			zend_refcounted *ref = Z_COUNTED_P(value);
-
-			value = Z_REFVAL_P(value);
-			ZVAL_COPY_VALUE(arg, value);
-			if (UNEXPECTED(GC_DELREF(ref) == 0)) {
-				efree_size(ref, sizeof(zend_reference));
-			} else if (Z_OPT_REFCOUNTED_P(arg)) {
-				Z_ADDREF_P(arg);
-			}
-		} else {
-			ZVAL_COPY_VALUE(arg, value);
-		}
-	} else { /* CONST */
-		ZVAL_COPY_VALUE(arg, value);
-		if (UNEXPECTED(Z_OPT_REFCOUNTED_P(arg))) {
-			Z_ADDREF_P(arg);
-		}
-	}
-	ZEND_VM_NEXT_OPCODE();
-}
-
 ZEND_VM_HOT_SEND_HANDLER(66, ZEND_SEND_VAR_EX, VAR|CV, CONST|UNUSED|NUM, SPEC(QUICK_ARG))
 {
 	USE_OPLINE