diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-04-12 02:35:42 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-04-12 02:35:42 +0300 |
| commit | 55cc280429c453a89e33de7357fa80589470dfc3 (patch) | |
| tree | 4185afc2c6405d42751fc354a20676be9408d904 /Zend/zend_generators.c | |
| parent | 88a2268d6b9ff152399a8761dc826ce414c0b985 (diff) | |
| download | php-git-55cc280429c453a89e33de7357fa80589470dfc3.tar.gz | |
Backported call frame initialization improvement
Diffstat (limited to 'Zend/zend_generators.c')
| -rw-r--r-- | Zend/zend_generators.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index a59d84cda7..6b3f148b5b 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -40,10 +40,7 @@ ZEND_API void zend_generator_restore_call_stack(zend_generator *generator) /* {{ (ZEND_CALL_INFO(call) & ~ZEND_CALL_ALLOCATED), call->func, ZEND_CALL_NUM_ARGS(call), - (Z_TYPE(call->This) == IS_UNDEF) ? - (zend_class_entry*)Z_OBJ(call->This) : NULL, - (Z_TYPE(call->This) != IS_UNDEF) ? - Z_OBJ(call->This) : NULL); + Z_PTR(call->This)); memcpy(((zval*)new_call) + ZEND_CALL_FRAME_SLOT, ((zval*)call) + ZEND_CALL_FRAME_SLOT, ZEND_CALL_NUM_ARGS(call) * sizeof(zval)); new_call->prev_execute_data = prev_call; prev_call = new_call; |