com php-src: Fixed support for references: Zend/zend_vm_def .h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Mon, 16 Jun 2014 09:08:48 +0000 |
| Subject: | com php-src: Fixed support for references: Zend/zend_vm_def .h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78908@lists.php.net to get a copy of this message | ||
Commit: 3b2fb7abc5056b65459aad6ca53baa42f84a6349
Author: Dmitry Stogov <dmitry@zend.com> Mon, 16 Jun 2014 13:08:48 +0400
Parents: 17b98b6379fdae509f56961770793f992e30f911
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b2fb7abc5056b65459aad6ca53baa42f84a6349
Log:
Fixed support for references
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 60d7401...690a826 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3543,7 +3543,7 @@ ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMP|VAR|UNUSED|CV, ANY)
zend_object_clone_obj_t clone_call;
SAVE_OPLINE();
- obj = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_R);
+ obj = GET_OP1_OBJ_ZVAL_PTR_DEREF(BP_VAR_R);
if (OP1_TYPE == IS_CONST ||
UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ccf26e9..e37cba1 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -13190,7 +13190,7 @@ static int ZEND_FASTCALL
ZEND_CLONE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zend_object_clone_obj_t clone_call;
SAVE_OPLINE();
- obj = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ obj = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
if (IS_VAR == IS_CONST ||
UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
@@ -30315,7 +30315,7 @@ static int ZEND_FASTCALL
ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zend_object_clone_obj_t clone_call;
SAVE_OPLINE();
- obj = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
+ obj = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
if (IS_CV == IS_CONST ||
UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {