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.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.c')
| -rw-r--r-- | Zend/zend_execute.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 4de6ba0c07..9b7cbf294d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2554,7 +2554,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o OBJ_RELEASE(Z_OBJ(call->This)); } if (call->func->common.fn_flags & ZEND_ACC_CLOSURE) { - zend_object_release(ZEND_CLOSURE_OBJECT(call->func)); + zend_object_release((zend_object *) call->func->common.prototype); } else if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { zend_string_release(call->func->common.function_name); zend_free_trampoline(call->func); @@ -2735,7 +2735,8 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_object(zval * if (fbc->common.fn_flags & ZEND_ACC_CLOSURE) { /* Delay closure destruction until its invocation */ - GC_ADDREF(ZEND_CLOSURE_OBJECT(fbc)); + ZEND_ASSERT(GC_TYPE((zend_object*)fbc->common.prototype) == IS_OBJECT); + GC_ADDREF((zend_object*)fbc->common.prototype); call_info |= ZEND_CALL_CLOSURE; if (fbc->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) { call_info |= ZEND_CALL_FAKE_CLOSURE; |