diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-11 17:27:26 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-11 17:27:26 +0300 |
| commit | 6ba10a03e7b14089e2f53305dec9a6ec06a7eb64 (patch) | |
| tree | 9a8da85cf1145c0e52691d6ece4553ac8cc8234b /Zend/zend_execute_API.c | |
| parent | da8204ba1c5e688164b14bd914900df7b84047cb (diff) | |
| download | php-git-6ba10a03e7b14089e2f53305dec9a6ec06a7eb64.tar.gz | |
Revert "Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse." (this patch is incomplete or wrong)
This reverts commit 781e1573afdc7c336b3577ceabc9c65cafea17e8.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index f66bd66304..61d92914bb 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -776,7 +776,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / if (UNEXPECTED(func->op_array.fn_flags & ZEND_ACC_CLOSURE)) { uint32_t call_info; - GC_ADDREF(ZEND_CLOSURE_OBJECT(func)); + ZEND_ASSERT(GC_TYPE((zend_object*)func->op_array.prototype) == IS_OBJECT); + GC_ADDREF((zend_object*)func->op_array.prototype); call_info = ZEND_CALL_CLOSURE; if (func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) { call_info |= ZEND_CALL_FAKE_CLOSURE; |