Skip to content

Commit 25050e3

Browse files
laruencelaruence
committed
Merge branch 'PHP-5.5' into PHP-5.6
2 parents b5589d3 + f074870 commit 25050e3

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMP|VAR
407407
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
408408
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
409409
}
410-
zval_ptr_dtor(&object);
411410
if (RETURN_VALUE_USED(opline)) {
412411
PZVAL_LOCK(z);
413412
EX_T(opline->result.var).var.ptr = z;
@@ -420,6 +419,7 @@ ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMP|VAR
420419
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
421420
}
422421
}
422+
zval_ptr_dtor(&object);
423423
}
424424

425425
if (IS_OP2_TMP_FREE()) {

‎Zend/zend_vm_execute.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14577,7 +14577,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*b
1457714577
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
1457814578
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
1457914579
}
14580-
zval_ptr_dtor(&object);
1458114580
if (RETURN_VALUE_USED(opline)) {
1458214581
PZVAL_LOCK(z);
1458314582
EX_T(opline->result.var).var.ptr = z;
@@ -14590,6 +14589,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*b
1459014589
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
1459114590
}
1459214591
}
14592+
zval_ptr_dtor(&object);
1459314593
}
1459414594

1459514595
if (0) {
@@ -17088,7 +17088,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_TMP(int (*bin
1708817088
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
1708917089
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
1709017090
}
17091-
zval_ptr_dtor(&object);
1709217091
if (RETURN_VALUE_USED(opline)) {
1709317092
PZVAL_LOCK(z);
1709417093
EX_T(opline->result.var).var.ptr = z;
@@ -17101,6 +17100,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_TMP(int (*bin
1710117100
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
1710217101
}
1710317102
}
17103+
zval_ptr_dtor(&object);
1710417104
}
1710517105

1710617106
if (1) {
@@ -19186,7 +19186,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_VAR(int (*bin
1918619186
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
1918719187
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
1918819188
}
19189-
zval_ptr_dtor(&object);
1919019189
if (RETURN_VALUE_USED(opline)) {
1919119190
PZVAL_LOCK(z);
1919219191
EX_T(opline->result.var).var.ptr = z;
@@ -19199,6 +19198,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_VAR(int (*bin
1919919198
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
1920019199
}
1920119200
}
19201+
zval_ptr_dtor(&object);
1920219202
}
1920319203

1920419204
if (0) {
@@ -21389,7 +21389,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*
2138921389
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
2139021390
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
2139121391
}
21392-
zval_ptr_dtor(&object);
2139321392
if (RETURN_VALUE_USED(opline)) {
2139421393
PZVAL_LOCK(z);
2139521394
EX_T(opline->result.var).var.ptr = z;
@@ -21402,6 +21401,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (*
2140221401
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
2140321402
}
2140421403
}
21404+
zval_ptr_dtor(&object);
2140521405
}
2140621406

2140721407
if (0) {
@@ -22819,7 +22819,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*bina
2281922819
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
2282022820
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
2282122821
}
22822-
zval_ptr_dtor(&object);
2282322822
if (RETURN_VALUE_USED(opline)) {
2282422823
PZVAL_LOCK(z);
2282522824
EX_T(opline->result.var).var.ptr = z;
@@ -22832,6 +22831,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*bina
2283222831
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
2283322832
}
2283422833
}
22834+
zval_ptr_dtor(&object);
2283522835
}
2283622836

2283722837
if (0) {
@@ -24778,7 +24778,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int
2477824778
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
2477924779
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
2478024780
}
24781-
zval_ptr_dtor(&object);
2478224781
if (RETURN_VALUE_USED(opline)) {
2478324782
PZVAL_LOCK(z);
2478424783
EX_T(opline->result.var).var.ptr = z;
@@ -24791,6 +24790,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int
2479124790
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
2479224791
}
2479324792
}
24793+
zval_ptr_dtor(&object);
2479424794
}
2479524795

2479624796
if (0) {
@@ -26191,7 +26191,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*
2619126191
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
2619226192
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
2619326193
}
26194-
zval_ptr_dtor(&object);
2619526194
if (RETURN_VALUE_USED(opline)) {
2619626195
PZVAL_LOCK(z);
2619726196
EX_T(opline->result.var).var.ptr = z;
@@ -26204,6 +26203,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (*
2620426203
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
2620526204
}
2620626205
}
26206+
zval_ptr_dtor(&object);
2620726207
}
2620826208

2620926209
if (1) {
@@ -27513,7 +27513,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*
2751327513
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
2751427514
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
2751527515
}
27516-
zval_ptr_dtor(&object);
2751727516
if (RETURN_VALUE_USED(opline)) {
2751827517
PZVAL_LOCK(z);
2751927518
EX_T(opline->result.var).var.ptr = z;
@@ -27526,6 +27525,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (*
2752627525
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
2752727526
}
2752827527
}
27528+
zval_ptr_dtor(&object);
2752927529
}
2753027530

2753127531
if (0) {
@@ -28836,7 +28836,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int
2883628836
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
2883728837
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
2883828838
}
28839-
zval_ptr_dtor(&object);
2884028839
if (RETURN_VALUE_USED(opline)) {
2884128840
PZVAL_LOCK(z);
2884228841
EX_T(opline->result.var).var.ptr = z;
@@ -28849,6 +28848,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int
2884928848
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
2885028849
}
2885128850
}
28851+
zval_ptr_dtor(&object);
2885228852
}
2885328853

2885428854
if (0) {
@@ -29267,7 +29267,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*b
2926729267
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
2926829268
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
2926929269
}
29270-
zval_ptr_dtor(&object);
2927129270
if (RETURN_VALUE_USED(opline)) {
2927229271
PZVAL_LOCK(z);
2927329272
EX_T(opline->result.var).var.ptr = z;
@@ -29280,6 +29279,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*b
2928029279
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
2928129280
}
2928229281
}
29282+
zval_ptr_dtor(&object);
2928329283
}
2928429284

2928529285
if (0) {
@@ -32102,7 +32102,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*bi
3210232102
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
3210332103
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
3210432104
}
32105-
zval_ptr_dtor(&object);
3210632105
if (RETURN_VALUE_USED(opline)) {
3210732106
PZVAL_LOCK(z);
3210832107
EX_T(opline->result.var).var.ptr = z;
@@ -32115,6 +32114,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*bi
3211532114
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
3211632115
}
3211732116
}
32117+
zval_ptr_dtor(&object);
3211832118
}
3211932119

3212032120
if (0) {
@@ -34382,7 +34382,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*bina
3438234382
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
3438334383
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
3438434384
}
34385-
zval_ptr_dtor(&object);
3438634385
if (RETURN_VALUE_USED(opline)) {
3438734386
PZVAL_LOCK(z);
3438834387
EX_T(opline->result.var).var.ptr = z;
@@ -34395,6 +34394,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*bina
3439534394
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
3439634395
}
3439734396
}
34397+
zval_ptr_dtor(&object);
3439834398
}
3439934399

3440034400
if (1) {
@@ -36341,7 +36341,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*bina
3634136341
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
3634236342
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
3634336343
}
36344-
zval_ptr_dtor(&object);
3634536344
if (RETURN_VALUE_USED(opline)) {
3634636345
PZVAL_LOCK(z);
3634736346
EX_T(opline->result.var).var.ptr = z;
@@ -36354,6 +36353,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*bina
3635436353
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
3635536354
}
3635636355
}
36356+
zval_ptr_dtor(&object);
3635736357
}
3635836358

3635936359
if (0) {
@@ -38404,7 +38404,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*b
3840438404
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
3840538405
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
3840638406
}
38407-
zval_ptr_dtor(&object);
3840838407
if (RETURN_VALUE_USED(opline)) {
3840938408
PZVAL_LOCK(z);
3841038409
EX_T(opline->result.var).var.ptr = z;
@@ -38417,6 +38416,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*b
3841738416
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
3841838417
}
3841938418
}
38419+
zval_ptr_dtor(&object);
3842038420
}
3842138421

3842238422
if (0) {
@@ -39685,7 +39685,6 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binar
3968539685
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
3968639686
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
3968739687
}
39688-
zval_ptr_dtor(&object);
3968939688
if (RETURN_VALUE_USED(opline)) {
3969039689
PZVAL_LOCK(z);
3969139690
EX_T(opline->result.var).var.ptr = z;
@@ -39698,6 +39697,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binar
3969839697
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
3969939698
}
3970039699
}
39700+
zval_ptr_dtor(&object);
3970139701
}
3970239702

3970339703
if (0) {

0 commit comments

Comments
 (0)