diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-24 16:37:43 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-24 16:37:43 +0800 |
| commit | 0b37b90ec40eeaa6963130e864eba02bea9d39ce (patch) | |
| tree | 231f6663f4c43d8b332a4f55f01048e47f2addc3 /Zend/zend_execute.c | |
| parent | 1bb59c73c4b89c0fd91eca28faeae4fb1d5287fe (diff) | |
| parent | 448e28cc8445826d356dc8cef526a103bd798a9a (diff) | |
| download | php-git-0b37b90ec40eeaa6963130e864eba02bea9d39ce.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index d02a039ab2..2c20fb329e 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -620,9 +620,7 @@ static void zend_assign_to_variable_reference(zval *variable_ptr, zval *value_pt zval_ptr_dtor(variable_ptr); ZVAL_COPY_VALUE(variable_ptr, value_ptr); } else if (!Z_ISREF_P(variable_ptr)) { - SEPARATE_ZVAL_TO_MAKE_IS_REF(value_ptr); - Z_ADDREF_P(value_ptr); - ZVAL_COPY_VALUE(variable_ptr, value_ptr); + ZVAL_NEW_REF(variable_ptr, variable_ptr); } } |