com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_v m_def.h Zend/zend_vm_execute.h
| From: | Xinchen Hui | Date: | Tue, 10 Mar 2015 09:18:47 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_v m_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85437@lists.php.net to get a copy of this message | ||
Commit: 25050e3b00b448056ac780510923e076e7dcd270
Author: Xinchen Hui <laruence@php.net> Tue, 10 Mar 2015 17:18:47 +0800
Parents: b5589d3fb46bd3f8705153657df6d86a6145f4ad f074870f4e39e3dc1b8978024b3682ab43d3e8e5
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=25050e3b00b448056ac780510923e076e7dcd270
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc Zend/zend_vm_def.h
index aa34efa,8954e69..efd98d1
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -418,8 -420,10 +417,9 @@@ ZEND_VM_HELPER_EX(zend_binary_assign_op
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (IS_OP2_TMP_FREE()) {
diff --cc Zend/zend_vm_execute.h
index a89e1d5,c0b64b6..e9c7f51
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -14588,8 -14196,10 +14587,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -17099,8 -16713,10 +17098,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (1) {
@@@ -19197,8 -18810,10 +19196,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -21400,8 -21014,10 +21399,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -22830,8 -22448,10 +22829,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -24789,8 -24406,10 +24788,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -26202,8 -25828,10 +26201,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (1) {
@@@ -27524,8 -27154,10 +27523,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var)..var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -28847,8 -28481,10 +28846,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -29278,8 -28909,10 +29277,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -32113,8 -31723,10 +32112,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -34393,8 -34005,10 +34392,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (1) {
@@@ -36352,8 -35964,10 +36351,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -38415,8 -38029,10 +38414,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var)..var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {
@@@ -39696,8 -39315,10 +39695,9 @@@ static int ZEND_FASTCALL zend_binary_as
if (RETURN_VALUE_USED(opline)) {
PZVAL_LOCK(&EG(uninitialized_zval));
EX_T(opline->result.var).var.ptr = &EG(uninitialized_zval);
- EX_T(opline->result.var).var.ptr_ptr = NULL;
}
}
+ zval_ptr_dtor(&object);
}
if (0) {