com php-src: Fixed support for references: Zend/zend_vm_def .h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Fri, 11 Apr 2014 07:15:31 +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-77436@lists.php.net to get a copy of this message | ||
Commit: aeb64f5447083c9f10aa324aa2b9976d69ca2410
Author: Dmitry Stogov <dmitry@zend.com> Fri, 11 Apr 2014 11:15:31 +0400
Parents: 70ba20bfd38b0fbdfe5035eaa82568136fff79b2
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aeb64f5447083c9f10aa324aa2b9976d69ca2410
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 2d0d180...730450f 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2395,7 +2395,7 @@ ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMP|VAR|UNUSED|CV)
ZEND_VM_NEXT_OPCODE();
} else {
zend_free_op free_op2;
- zval *class_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
+ zval *class_name = GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R);
if (OP2_TYPE == IS_CONST) {
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index bcbbd9c..8a108cd 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1902,7 +1902,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_
ZEND_VM_NEXT_OPCODE();
} else {
zend_free_op free_op2;
- zval *class_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC);
+ zval *class_name = _get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2
TSRMLS_CC);
if (IS_VAR == IS_CONST) {
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
@@ -2130,7 +2130,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_A
ZEND_VM_NEXT_OPCODE();
} else {
- zval *class_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
+ zval *class_name = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
if (IS_CV == IS_CONST) {
if (CACHED_PTR(opline->op2.literal->cache_slot)) {