diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-02-29 19:28:40 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-02-29 19:28:40 +0000 |
| commit | 80015ba741fc857074050086db6c7b2a4716d6d5 (patch) | |
| tree | 9e0b85868c092ae83a0df2bd4f33f79ba773aab2 /sapi/phpdbg/phpdbg_utils.h | |
| parent | 4ea2a0fd60cdf75d746909198ea69f1e3e4ba193 (diff) | |
| parent | 31dc08a904f2a91b582396b6ba118abfd12cf246 (diff) | |
| download | php-git-80015ba741fc857074050086db6c7b2a4716d6d5.tar.gz | |
Merge branch 'PHP-7.0' into openssl_error_store
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.h b/sapi/phpdbg/phpdbg_utils.h index 2bd4f35d71..4ba756139b 100644 --- a/sapi/phpdbg/phpdbg_utils.h +++ b/sapi/phpdbg/phpdbg_utils.h @@ -99,6 +99,14 @@ char *phpdbg_short_zval_print(zval *zv, int maxlen); PHPDBG_API zend_bool phpdbg_check_caught_ex(zend_execute_data *ex, zend_object *exception); +static zend_always_inline zend_execute_data *phpdbg_user_execute_data(zend_execute_data *ex) { + while (!ex->func || !ZEND_USER_CODE(ex->func->common.type)) { + ex = ex->prev_execute_data; + ZEND_ASSERT(ex); + } + return ex; +} + #ifdef ZTS #define PHPDBG_OUTPUT_BACKUP_DEFINES() \ zend_output_globals *output_globals_ptr; \ |