Skip to content

Commit 8318379

Browse files
nikicnikic
committed
Switch back to FREE_UNFETCHED_OP_DATA
Some of the code paths leading to this do not fetch op data. Hopefully this fixes the release build failure.
1 parent 5795dfd commit 8318379

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2705,7 +2705,7 @@ ZEND_VM_C_LABEL(try_assign_dim_array):
27052705
}
27062706
dim = GET_OP2_ZVAL_PTR(BP_VAR_R);
27072707
ZEND_VM_C_LABEL(assign_dim_error):
2708-
FREE_OP_DATA();
2708+
FREE_UNFETCHED_OP_DATA();
27092709
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
27102710
ZVAL_NULL(EX_VAR(opline->result.var));
27112711
}

‎Zend/zend_vm_execute.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23307,7 +23307,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_CONST_OP_D
2330723307
}
2330823308
dim = RT_CONSTANT(opline, opline->op2);
2330923309
assign_dim_error:
23310-
zval_ptr_dtor_nogc(free_op_data);
23310+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2331123311
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2331223312
ZVAL_NULL(EX_VAR(opline->result.var));
2331323313
}
@@ -23422,7 +23422,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_CONST_OP_D
2342223422
}
2342323423
dim = RT_CONSTANT(opline, opline->op2);
2342423424
assign_dim_error:
23425-
zval_ptr_dtor_nogc(free_op_data);
23425+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2342623426
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2342723427
ZVAL_NULL(EX_VAR(opline->result.var));
2342823428
}
@@ -25601,7 +25601,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_TMPVAR_OP_
2560125601
}
2560225602
dim = _get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC);
2560325603
assign_dim_error:
25604-
zval_ptr_dtor_nogc(free_op_data);
25604+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2560525605
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2560625606
ZVAL_NULL(EX_VAR(opline->result.var));
2560725607
}
@@ -25716,7 +25716,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_TMPVAR_OP_
2571625716
}
2571725717
dim = _get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC);
2571825718
assign_dim_error:
25719-
zval_ptr_dtor_nogc(free_op_data);
25719+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2572025720
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2572125721
ZVAL_NULL(EX_VAR(opline->result.var));
2572225722
}
@@ -27176,7 +27176,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_OP_
2717627176
}
2717727177
dim = NULL;
2717827178
assign_dim_error:
27179-
zval_ptr_dtor_nogc(free_op_data);
27179+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2718027180
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2718127181
ZVAL_NULL(EX_VAR(opline->result.var));
2718227182
}
@@ -27291,7 +27291,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_UNUSED_OP_
2729127291
}
2729227292
dim = NULL;
2729327293
assign_dim_error:
27294-
zval_ptr_dtor_nogc(free_op_data);
27294+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2729527295
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2729627296
ZVAL_NULL(EX_VAR(opline->result.var));
2729727297
}
@@ -29274,7 +29274,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_CV_OP_DATA
2927429274
}
2927529275
dim = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
2927629276
assign_dim_error:
29277-
zval_ptr_dtor_nogc(free_op_data);
29277+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2927829278
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2927929279
ZVAL_NULL(EX_VAR(opline->result.var));
2928029280
}
@@ -29389,7 +29389,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_VAR_CV_OP_DATA
2938929389
}
2939029390
dim = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
2939129391
assign_dim_error:
29392-
zval_ptr_dtor_nogc(free_op_data);
29392+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
2939329393
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
2939429394
ZVAL_NULL(EX_VAR(opline->result.var));
2939529395
}
@@ -40475,7 +40475,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_CONST_OP_DA
4047540475
}
4047640476
dim = RT_CONSTANT(opline, opline->op2);
4047740477
assign_dim_error:
40478-
zval_ptr_dtor_nogc(free_op_data);
40478+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4047940479
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4048040480
ZVAL_NULL(EX_VAR(opline->result.var));
4048140481
}
@@ -40590,7 +40590,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_CONST_OP_DA
4059040590
}
4059140591
dim = RT_CONSTANT(opline, opline->op2);
4059240592
assign_dim_error:
40593-
zval_ptr_dtor_nogc(free_op_data);
40593+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4059440594
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4059540595
ZVAL_NULL(EX_VAR(opline->result.var));
4059640596
}
@@ -43973,7 +43973,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_TMPVAR_OP_D
4397343973
}
4397443974
dim = _get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC);
4397543975
assign_dim_error:
43976-
zval_ptr_dtor_nogc(free_op_data);
43976+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4397743977
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4397843978
ZVAL_NULL(EX_VAR(opline->result.var));
4397943979
}
@@ -44088,7 +44088,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_TMPVAR_OP_D
4408844088
}
4408944089
dim = _get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC);
4409044090
assign_dim_error:
44091-
zval_ptr_dtor_nogc(free_op_data);
44091+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4409244092
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4409344093
ZVAL_NULL(EX_VAR(opline->result.var));
4409444094
}
@@ -46002,7 +46002,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_OP_D
4600246002
}
4600346003
dim = NULL;
4600446004
assign_dim_error:
46005-
zval_ptr_dtor_nogc(free_op_data);
46005+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4600646006
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4600746007
ZVAL_NULL(EX_VAR(opline->result.var));
4600846008
}
@@ -46117,7 +46117,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_UNUSED_OP_D
4611746117
}
4611846118
dim = NULL;
4611946119
assign_dim_error:
46120-
zval_ptr_dtor_nogc(free_op_data);
46120+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4612146121
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4612246122
ZVAL_NULL(EX_VAR(opline->result.var));
4612346123
}
@@ -49051,7 +49051,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_CV_OP_DATA_
4905149051
}
4905249052
dim = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
4905349053
assign_dim_error:
49054-
zval_ptr_dtor_nogc(free_op_data);
49054+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4905549055
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4905649056
ZVAL_NULL(EX_VAR(opline->result.var));
4905749057
}
@@ -49166,7 +49166,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_DIM_SPEC_CV_CV_OP_DATA_
4916649166
}
4916749167
dim = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
4916849168
assign_dim_error:
49169-
zval_ptr_dtor_nogc(free_op_data);
49169+
zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var));
4917049170
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
4917149171
ZVAL_NULL(EX_VAR(opline->result.var));
4917249172
}

0 commit comments

Comments
 (0)