diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-04-21 10:15:57 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-04-21 10:15:57 +0300 |
| commit | c026ca6cdccc74ca78d8b0ab203281c19b93cdde (patch) | |
| tree | b74b4d46fba2974ac44b5d4492912e8f6b797cbe /Zend/zend_execute.c | |
| parent | 650c1c0a7d94d3bb052a93407b6e280df9c265a4 (diff) | |
| parent | ecf6392243b90e6c8f5597076b11b4959bac9dc1 (diff) | |
| download | php-git-c026ca6cdccc74ca78d8b0ab203281c19b93cdde.tar.gz | |
Merge branch 'master' into safe_timeout
* master:
Fixed bug #72059 - Reference the bug id directly in NEWS
Fix magic constants (__LINE__) with ?? for constant scalar exprs
Add NEWS entry for ?? in constant scalar expressions
allow null coalescing (??) on constant expressions
Fix intl tests for ICU < 52
Fix ZTS builds by adding a missing TSRMLS_FETCH().
Fix bug #71737
Update NEWS
Fix RECV opcode to handle all kinds of exceptions
Fix RECV opcode to handle all kinds of exceptions
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index be4b039d89..68fc5e7f5d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1938,6 +1938,12 @@ ZEND_API void zend_fetch_dimension_by_zval(zval *result, zval *container, zval * zend_fetch_dimension_address_read_R(result, container, dim, IS_TMP_VAR); } +ZEND_API void zend_fetch_dimension_by_zval_is(zval *result, zval *container, zval *dim, int dim_type) +{ + zend_fetch_dimension_address_read(result, container, dim, dim_type, BP_VAR_IS, 1); +} + + static zend_always_inline void zend_fetch_property_address(zval *result, zval *container, uint32_t container_op_type, zval *prop_ptr, uint32_t prop_op_type, void **cache_slot, int type) { if (container_op_type != IS_UNUSED && UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT)) { |