More fixes

Author: iluuu1994

Zend/Optimizer/optimize_func_calls.c

@@ -226,8 +226,7 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 					 * the DO opcode is used, allowing to optimize calls to
 					 * ZEND_ACC_NODISCARD functions. */
 					if (opline->opcode != ZEND_CALLABLE_CONVERT) {
-						// FIXME: Maintain BP_VAR_FUNC_ARG semantics when appropriate.
-						opline->opcode = zend_get_call_op(fcall, call_stack[call].func, !RESULT_UNUSED(opline), BP_VAR_R);
+						opline->opcode = zend_get_call_op(fcall, call_stack[call].func, !RESULT_UNUSED(opline));
 					}
 
 					if ((ZEND_OPTIMIZER_PASS_16 & ctx->optimization_level)

Zend/zend_compile.c

@@ -3939,7 +3939,7 @@ static uint32_t zend_compile_args(
 }
 /* }}} */
 
-ZEND_API uint8_t zend_get_call_op(const zend_op *init_op, const zend_function *fbc, bool result_used, uint32_t type) /* {{{ */
+ZEND_API uint8_t zend_get_call_op(const zend_op *init_op, const zend_function *fbc, bool result_used) /* {{{ */
 {
 	uint32_t no_discard = result_used ? 0 : ZEND_ACC_NODISCARD;
 
@@ -4022,8 +4022,7 @@ static bool zend_compile_call_common(znode *result, zend_ast *args_ast, const ze
 		 * know if the result is used. Deoptimize #[\NoDiscard]
 		 * calls to be sure. The optimizer will fix this up.
 		 */
-		false,
-		type
+		false
 	);
 	opline = zend_emit_op(result, call_op, NULL, NULL);
 

Zend/zend_compile.h

@@ -1005,7 +1005,7 @@ ZEND_API bool zend_is_compiling(void);
 ZEND_API char *zend_make_compiled_string_description(const char *name);
 ZEND_API void zend_initialize_class_data(zend_class_entry *ce, bool nullify_handlers);
 uint32_t zend_get_class_fetch_type(const zend_string *name);
-ZEND_API uint8_t zend_get_call_op(const zend_op *init_op, const zend_function *fbc, bool result_used, uint32_t type);
+ZEND_API uint8_t zend_get_call_op(const zend_op *init_op, const zend_function *fbc, bool result_used);
 ZEND_API bool zend_is_smart_branch(const zend_op *opline);
 
 typedef bool (*zend_auto_global_callback)(zend_string *name);

Zend/zend_vm_def.h

@@ -4265,7 +4265,6 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL,OBSERVER))
 		}
 		ZEND_ASSERT(opline->result_type != IS_TMP_VAR || !Z_ISREF_P(ret));
 #endif
-
 		ZEND_OBSERVER_FCALL_END(call, EG(exception) ? NULL : ret);
 		ZEND_VM_FCALL_INTERRUPT_CHECK(call);
 
@@ -4395,7 +4394,6 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
 		}
 		ZEND_ASSERT(opline->result_type != IS_TMP_VAR || !Z_ISREF_P(ret));
 #endif
-
 		ZEND_OBSERVER_FCALL_END(call, EG(exception) ? NULL : ret);
 		ZEND_VM_FCALL_INTERRUPT_CHECK(call);