Fix unused variable warning

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index de98a3a824110fb63ae1455503d5ec5d3eea130d..d5b8ba781f4409214e5d8ea33f2b18c54423a7cc 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4157,8 +4157,6 @@ ZEND_VM_C_LABEL(fcall_end):
 
 ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV, UNUSED|CACHE_SLOT)
 {
-       USE_OPLINE
-
        if (OP1_TYPE == IS_UNUSED) {
                SAVE_OPLINE();
                zend_verify_missing_return_type(EX(func));
@@ -4166,6 +4164,7 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV
        } else {
 /* prevents "undefined variable opline" errors */
 #if !ZEND_VM_SPEC || (OP1_TYPE != IS_UNUSED)
+               USE_OPLINE
                zval *retval_ref, *retval_ptr;
                zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
                retval_ref = retval_ptr = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 8cdc2673699f1f65456f39ea7f59c717a086e12c..15d9f9ba5f1e7669fe4f0dda503de19d712d70ed 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -9032,8 +9032,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
 
 static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
-       USE_OPLINE
-
        if (IS_CONST == IS_UNUSED) {
                SAVE_OPLINE();
                zend_verify_missing_return_type(EX(func));
@@ -9041,6 +9039,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYP
        } else {
 /* prevents "undefined variable opline" errors */
 #if 0 || (IS_CONST != IS_UNUSED)
+               USE_OPLINE
                zval *retval_ref, *retval_ptr;
                zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
                retval_ref = retval_ptr = RT_CONSTANT(opline, opline->op1);
@@ -19366,8 +19365,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UN
 
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
-       USE_OPLINE
-
        if (IS_TMP_VAR == IS_UNUSED) {
                SAVE_OPLINE();
                zend_verify_missing_return_type(EX(func));
@@ -19375,6 +19372,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UN
        } else {
 /* prevents "undefined variable opline" errors */
 #if 0 || (IS_TMP_VAR != IS_UNUSED)
+               USE_OPLINE
                zval *retval_ref, *retval_ptr;
                zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
                retval_ref = retval_ptr = _get_zval_ptr_tmp(opline->op1.var EXECUTE_DATA_CC);
@@ -26960,8 +26958,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
 
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
-       USE_OPLINE
-
        if (IS_VAR == IS_UNUSED) {
                SAVE_OPLINE();
                zend_verify_missing_return_type(EX(func));
@@ -26969,6 +26965,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UN
        } else {
 /* prevents "undefined variable opline" errors */
 #if 0 || (IS_VAR != IS_UNUSED)
+               USE_OPLINE
                zval *retval_ref, *retval_ptr;
                zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
                retval_ref = retval_ptr = _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC);
@@ -34158,8 +34155,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
 
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
-       USE_OPLINE
-
        if (IS_UNUSED == IS_UNUSED) {
                SAVE_OPLINE();
                zend_verify_missing_return_type(EX(func));
@@ -34167,6 +34162,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED
        } else {
 /* prevents "undefined variable opline" errors */
 #if 0 || (IS_UNUSED != IS_UNUSED)
+               USE_OPLINE
                zval *retval_ref, *retval_ptr;
                zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
                retval_ref = retval_ptr = NULL;
@@ -45832,8 +45828,6 @@ assign_dim_error:
 
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
-       USE_OPLINE
-
        if (IS_CV == IS_UNUSED) {
                SAVE_OPLINE();
                zend_verify_missing_return_type(EX(func));
@@ -45841,6 +45835,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNU
        } else {
 /* prevents "undefined variable opline" errors */
 #if 0 || (IS_CV != IS_UNUSED)
+               USE_OPLINE
                zval *retval_ref, *retval_ptr;
                zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
                retval_ref = retval_ptr = EX_VAR(opline->op1.var);