Skip to content

Commit 9277713

Browse files
committed
Fix unused variable warning
1 parent b2bc2c6 commit 9277713

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

Zend/zend_vm_def.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4157,15 +4157,14 @@ ZEND_VM_C_LABEL(fcall_end):
41574157

41584158
ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV, UNUSED|CACHE_SLOT)
41594159
{
4160-
USE_OPLINE
4161-
41624160
if (OP1_TYPE == IS_UNUSED) {
41634161
SAVE_OPLINE();
41644162
zend_verify_missing_return_type(EX(func));
41654163
HANDLE_EXCEPTION();
41664164
} else {
41674165
/* prevents "undefined variable opline" errors */
41684166
#if !ZEND_VM_SPEC || (OP1_TYPE != IS_UNUSED)
4167+
USE_OPLINE
41694168
zval *retval_ref, *retval_ptr;
41704169
zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
41714170
retval_ref = retval_ptr = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);

Zend/zend_vm_execute.h

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9032,15 +9032,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
90329032

90339033
static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
90349034
{
9035-
USE_OPLINE
9036-
90379035
if (IS_CONST == IS_UNUSED) {
90389036
SAVE_OPLINE();
90399037
zend_verify_missing_return_type(EX(func));
90409038
HANDLE_EXCEPTION();
90419039
} else {
90429040
/* prevents "undefined variable opline" errors */
90439041
#if 0 || (IS_CONST != IS_UNUSED)
9042+
USE_OPLINE
90449043
zval *retval_ref, *retval_ptr;
90459044
zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
90469045
retval_ref = retval_ptr = RT_CONSTANT(opline, opline->op1);
@@ -19366,15 +19365,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_DIM_FUNC_ARG_SPEC_TMP_UN
1936619365

1936719366
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
1936819367
{
19369-
USE_OPLINE
19370-
1937119368
if (IS_TMP_VAR == IS_UNUSED) {
1937219369
SAVE_OPLINE();
1937319370
zend_verify_missing_return_type(EX(func));
1937419371
HANDLE_EXCEPTION();
1937519372
} else {
1937619373
/* prevents "undefined variable opline" errors */
1937719374
#if 0 || (IS_TMP_VAR != IS_UNUSED)
19375+
USE_OPLINE
1937819376
zval *retval_ref, *retval_ptr;
1937919377
zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
1938019378
retval_ref = retval_ptr = _get_zval_ptr_tmp(opline->op1.var EXECUTE_DATA_CC);
@@ -26960,15 +26958,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
2696026958

2696126959
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
2696226960
{
26963-
USE_OPLINE
26964-
2696526961
if (IS_VAR == IS_UNUSED) {
2696626962
SAVE_OPLINE();
2696726963
zend_verify_missing_return_type(EX(func));
2696826964
HANDLE_EXCEPTION();
2696926965
} else {
2697026966
/* prevents "undefined variable opline" errors */
2697126967
#if 0 || (IS_VAR != IS_UNUSED)
26968+
USE_OPLINE
2697226969
zval *retval_ref, *retval_ptr;
2697326970
zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
2697426971
retval_ref = retval_ptr = _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC);
@@ -34158,15 +34155,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
3415834155

3415934156
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
3416034157
{
34161-
USE_OPLINE
34162-
3416334158
if (IS_UNUSED == IS_UNUSED) {
3416434159
SAVE_OPLINE();
3416534160
zend_verify_missing_return_type(EX(func));
3416634161
HANDLE_EXCEPTION();
3416734162
} else {
3416834163
/* prevents "undefined variable opline" errors */
3416934164
#if 0 || (IS_UNUSED != IS_UNUSED)
34165+
USE_OPLINE
3417034166
zval *retval_ref, *retval_ptr;
3417134167
zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
3417234168
retval_ref = retval_ptr = NULL;
@@ -45832,15 +45828,14 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_OP_D
4583245828

4583345829
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
4583445830
{
45835-
USE_OPLINE
45836-
4583745831
if (IS_CV == IS_UNUSED) {
4583845832
SAVE_OPLINE();
4583945833
zend_verify_missing_return_type(EX(func));
4584045834
HANDLE_EXCEPTION();
4584145835
} else {
4584245836
/* prevents "undefined variable opline" errors */
4584345837
#if 0 || (IS_CV != IS_UNUSED)
45838+
USE_OPLINE
4584445839
zval *retval_ref, *retval_ptr;
4584545840
zend_arg_info *ret_info = EX(func)->common.arg_info - 1;
4584645841
retval_ref = retval_ptr = EX_VAR(opline->op1.var);

0 commit comments

Comments
 (0)