diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-10-01 16:35:56 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-10-01 16:35:56 +0400 |
| commit | 8857af8494db84242d666c0baf11ca6f08aab3e3 (patch) | |
| tree | bca308db29ac4d85a0bc98e9823998b782f5ab7f | |
| parent | d1cfc0b899370f500dcc1501f68750ef9a27cbfc (diff) | |
| download | php-git-8857af8494db84242d666c0baf11ca6f08aab3e3.tar.gz | |
Use inline finction for OBJ_RELEASE() macro
| -rw-r--r-- | Zend/zend_objects_API.h | 18 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 6 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
3 files changed, 12 insertions, 18 deletions
diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h index df22a26cc9..baa1a28bb4 100644 --- a/Zend/zend_objects_API.h +++ b/Zend/zend_objects_API.h @@ -37,14 +37,7 @@ } while (0) -#define OBJ_RELEASE(obj) do { \ - zend_object *_obj = (obj); \ - if (--GC_REFCOUNT(_obj) == 0) { \ - zend_objects_store_del(_obj TSRMLS_CC); \ - } else { \ - gc_possible_root(&_obj->gc TSRMLS_CC); \ - } \ - } while (0) +#define OBJ_RELEASE(obj) zend_object_release(obj TSRMLS_CC) typedef struct _zend_objects_store { zend_object **object_buckets; @@ -78,6 +71,15 @@ ZEND_API zend_object *zend_object_create_proxy(zval *object, zval *member TSRMLS ZEND_API zend_object_handlers *zend_get_std_object_handlers(void); END_EXTERN_C() +static zend_always_inline void zend_object_release(zend_object *obj TSRMLS_CC) +{ + if (--GC_REFCOUNT(obj) == 0) { + zend_objects_store_del(obj TSRMLS_CC); + } else if (UNEXPECTED(!GC_INFO(obj))) { + gc_possible_root(&obj->gc TSRMLS_CC); + } +} + #endif /* ZEND_OBJECTS_H */ /* diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c215fc35f8..489e27202b 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2710,11 +2710,7 @@ ZEND_VM_C_LABEL(fcall_end_change_scope): zend_object_store_ctor_failed(Z_OBJ(EG(This)) TSRMLS_CC); } } - if (!Z_DELREF(EG(This))) { - _zval_dtor_func_for_ptr(Z_COUNTED(EG(This)) ZEND_FILE_LINE_CC); - } else if (UNEXPECTED(!Z_GC_INFO(EG(This)))) { - gc_possible_root(Z_COUNTED(EG(This)) TSRMLS_CC); - } + OBJ_RELEASE(Z_OBJ(EG(This))); } Z_OBJ(EG(This)) = EX(object); EG(scope) = EX(scope); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index cb6fd8b5e2..f1fde5034b 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -671,11 +671,7 @@ fcall_end_change_scope: zend_object_store_ctor_failed(Z_OBJ(EG(This)) TSRMLS_CC); } } - if (!Z_DELREF(EG(This))) { - _zval_dtor_func_for_ptr(Z_COUNTED(EG(This)) ZEND_FILE_LINE_CC); - } else if (UNEXPECTED(!Z_GC_INFO(EG(This)))) { - gc_possible_root(Z_COUNTED(EG(This)) TSRMLS_CC); - } + OBJ_RELEASE(Z_OBJ(EG(This))); } Z_OBJ(EG(This)) = EX(object); EG(scope) = EX(scope); |