diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-02-05 19:41:47 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-02-05 19:41:47 +0300 |
| commit | ca035f26aa296acf553f289e2d459fd052367db2 (patch) | |
| tree | dcf38faa85759c7c076f3a11371a422ca7f5bee2 /sapi/phpdbg/phpdbg_utils.c | |
| parent | 070a0091b39b1196fe66bf2ba3c52ad4533f5497 (diff) | |
| download | php-git-ca035f26aa296acf553f289e2d459fd052367db2.tar.gz | |
Moved "zval.u2.cache_slot" into free room of "zend_op"
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index cdee919f79..71194633ab 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -764,16 +764,16 @@ PHPDBG_API zend_bool phpdbg_check_caught_ex(zend_execute_data *execute_data, zen while (1) { zend_class_entry *ce; - if (!(ce = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(cur, cur->op1))))) { + if (!(ce = CACHED_PTR(cur->extended_value & ~ZEND_LAST_CATCH))) { ce = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(cur, cur->op1)), RT_CONSTANT(cur, cur->op1) + 1, ZEND_FETCH_CLASS_NO_AUTOLOAD); - CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(cur, cur->op1)), ce); + CACHE_PTR(cur->extended_value & ~ZEND_LAST_CATCH, ce); } if (ce == exception->ce || (ce && instanceof_function(exception->ce, ce))) { return 1; } - if (cur->extended_value == ZEND_LAST_CATCH) { + if (cur->extended_value & ZEND_LAST_CATCH) { return 0; } |