com php-src: Fixed support for references: Zend/zend_vm_def .h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Wed, 26 Mar 2014 20:05:06 +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-77528@lists.php.net to get a copy of this message | ||
Commit: 92aef5279a32bcec250f72c755e60489939986ce
Author: Dmitry Stogov <dmitry@zend.com> Thu, 27 Mar 2014 00:05:06 +0400
Parents: f53c31265f411d9d8af5b745095aaf4507d046fe
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=92aef5279a32bcec250f72c755e60489939986ce
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 97a32dca...49479a4 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3875,6 +3875,9 @@ ZEND_VM_HANDLER(21, ZEND_CAST, CONST|TMP|VAR|CV, ANY)
SAVE_OPLINE();
expr = GET_OP1_ZVAL_PTR(BP_VAR_R);
+ if (Z_ISREF_P(expr)) {
+ expr = Z_REFVAL_P(expr);
+ }
if (opline->extended_value != IS_STRING) {
ZVAL_COPY_VALUE(result, expr);
if (!IS_OP1_TMP_FREE()) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ac26665..6984f61 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2807,6 +2807,9 @@ static int ZEND_FASTCALL
ZEND_CAST_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
SAVE_OPLINE();
expr = opline->op1.zv;
+ if (Z_ISREF_P(expr)) {
+ expr = Z_REFVAL_P(expr);
+ }
if (opline->extended_value != IS_STRING) {
ZVAL_COPY_VALUE(result, expr);
if (!0) {
@@ -7879,6 +7882,9 @@ static int ZEND_FASTCALL ZEND_CAST_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
SAVE_OPLINE();
expr = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ if (Z_ISREF_P(expr)) {
+ expr = Z_REFVAL_P(expr);
+ }
if (opline->extended_value != IS_STRING) {
ZVAL_COPY_VALUE(result, expr);
if (!1) {
@@ -13037,6 +13043,9 @@ static int ZEND_FASTCALL
ZEND_CAST_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
SAVE_OPLINE();
expr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
+ if (Z_ISREF_P(expr)) {
+ expr = Z_REFVAL_P(expr);
+ }
if (opline->extended_value != IS_STRING) {
ZVAL_COPY_VALUE(result, expr);
if (!0) {
@@ -30460,6 +30469,9 @@ static int ZEND_FASTCALL
ZEND_CAST_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
SAVE_OPLINE();
expr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
+ if (Z_ISREF_P(expr)) {
+ expr = Z_REFVAL_P(expr);
+ }
if (opline->extended_value != IS_STRING) {
ZVAL_COPY_VALUE(result, expr);
if (!0) {