Use inline finction for OBJ_RELEASE() macro

diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index df22a26cc92064d436ac7dfd49fa4c07156b75bd..baa1a28bb44cc39090163611adc741fa51f95c4b 100644 (file)
--- 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 c215fc35f82066a1230d93a634a4091796dce4fa..489e27202b7106fe63d8bd980c0751385e5c2ed3 100644 (file)
--- 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 cb6fd8b5e271d26c2ebab5f1b122e9d3afad78a0..f1fde5034b696affea23ac0759215a7a2c068c3f 100644 (file)
--- 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);