diff options
| author | Anatol Belski <ab@php.net> | 2014-12-12 14:25:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-12 14:25:59 +0100 |
| commit | dfb18b1188492efa48ade07029172c5535f65f93 (patch) | |
| tree | 5da6d50a4918a06299162a22aa5cb98e5c76a26a /Zend/zend_inheritance.c | |
| parent | de99a94c384fdb6a71c20692df33dc24a2b81a4b (diff) | |
| parent | f4311686cc2c7d07abce2b752b4e8597771c5b25 (diff) | |
| download | php-git-dfb18b1188492efa48ade07029172c5535f65f93.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
updated NEWS
PowerPC64 support for add and sub with overflow check
PowerPC64 support for operators with overflow check
Fixed bug #68583 Crash in timeout thread
Reduced size of zend_op on 64-bit systems.
Make ZEND_INIT_FCALL keep predcalculted size of necessary stack space in opline->op1.num to avoid its recalculation on each execution.
Removed unused variables
Improved array_merge() and array_replace() (1-st array may be added using simple procedure).
Replaced zendi_convert_to_long() with _zval_get_long_func()
Moved zend_is_true() from zend_execute.h/zend_execute_API.c into zend_operators.h/zend_operators.c. Splited the most expensive part of inline i_zend_is_true() into a separate zend_object_is_true(). Replaced zendi_convert_to_long() with cals to zend_is_true().
Revert "Save one xor instr"
Save one xor instr
Conflicts:
Zend/zend_execute_API.c
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 407acade0e..8f0d9fecb7 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -454,7 +454,7 @@ static zend_string *zend_get_function_declaration(zend_function *fptr TSRMLS_DC) } } if (precv && precv->opcode == ZEND_RECV_INIT && precv->op2_type != IS_UNUSED) { - zval *zv = precv->op2.zv; + zval *zv = RT_CONSTANT(&fptr->op_array, precv->op2); if (Z_TYPE_P(zv) == IS_CONSTANT) { smart_str_append(&str, Z_STR_P(zv)); |