Use OBJ_RELEASE.

twose · twose · commit 1f3607061444 · 2018-12-23T23:17:18.000+08:00
diff --git a/php_swoole.h b/php_swoole.h
@@ -1002,16 +1002,13 @@ static sw_inline void sw_fci_cache_persist(zend_fcall_info_cache *fci_cache)
 
 static sw_inline void sw_fci_cache_discard(zend_fcall_info_cache *fci_cache)
 {
-    zval _zobject, *zobject = &_zobject;
     if (fci_cache->object)
     {
-        ZVAL_OBJ(zobject, fci_cache->object);
-        zval_ptr_dtor(zobject);
+        OBJ_RELEASE(fci_cache->object);
     }
     if (fci_cache->function_handler->op_array.fn_flags & ZEND_ACC_CLOSURE)
     {
-        ZVAL_OBJ(zobject, ZEND_CLOSURE_OBJECT(fci_cache->function_handler));
-        zval_ptr_dtor(zobject);
+        OBJ_RELEASE(ZEND_CLOSURE_OBJECT(fci_cache->function_handler));
     }
 }
 
diff --git a/swoole_coroutine.cc b/swoole_coroutine.cc
@@ -215,26 +215,23 @@ static void php_coro_create(void *arg)
 {
     int i;
     php_args *php_arg = (php_args *) arg;
-    zend_fcall_info_cache *fci_cache = php_arg->fci_cache;
-    zend_function *func = fci_cache->function_handler;
+    zend_fcall_info_cache fci_cache = *php_arg->fci_cache;
+    zend_function *func = fci_cache.function_handler;
     zval *argv = php_arg->argv;
     int argc = php_arg->argc;
     coro_task *task;
     coro_task *origin_task = php_arg->origin_task;
     zend_execute_data *call;
-    zval _zobject, *zobject = nullptr;
     zval _retval, *retval = &_retval;
 
     if (swCoroG.count() > COROG.peak_coro_num)
     {
         COROG.peak_coro_num = swCoroG.count();
     }
 
-    if (fci_cache->object)
+    if (fci_cache.object)
     {
-        zobject = &_zobject;
-        ZVAL_OBJ(zobject, fci_cache->object);
-        Z_ADDREF_P(zobject);
+        GC_ADDREF(fci_cache.object);
     }
 
     php_vm_stack_init();
@@ -243,7 +240,7 @@ static void php_coro_create(void *arg)
     EG(vm_stack_top) = (zval *) ((char *) call + TASK_SLOT * sizeof(zval));
     call = zend_vm_stack_push_call_frame(
         ZEND_CALL_TOP_FUNCTION | ZEND_CALL_ALLOCATED,
-        func, argc, fci_cache->called_scope, fci_cache->object
+        func, argc, fci_cache.called_scope, fci_cache.object
     );
 
     SW_SET_EG_SCOPE(func->common.scope);
@@ -331,9 +328,9 @@ static void php_coro_create(void *arg)
 
     zval_ptr_dtor(retval);
 
-    if (zobject)
+    if (fci_cache.object)
     {
-        zval_ptr_dtor(zobject);
+        OBJ_RELEASE(fci_cache.object);
     }
 
     if (UNEXPECTED(EG(exception)))

Original file line number	Diff line number	Diff line change
`@@ -1002,16 +1002,13 @@ static sw_inline void sw_fci_cache_persist(zend_fcall_info_cache *fci_cache)`
`1002`	`1002`
`1003`	`1003`	`static sw_inline void sw_fci_cache_discard(zend_fcall_info_cache *fci_cache)`
`1004`	`1004`	`{`
`1005`		`- zval _zobject, *zobject = &_zobject;`
`1006`	`1005`	`if (fci_cache->object)`
`1007`	`1006`	`{`
`1008`		`- ZVAL_OBJ(zobject, fci_cache->object);`
`1009`		`- zval_ptr_dtor(zobject);`
	`1007`	`+ OBJ_RELEASE(fci_cache->object);`
`1010`	`1008`	`}`
`1011`	`1009`	`if (fci_cache->function_handler->op_array.fn_flags & ZEND_ACC_CLOSURE)`
`1012`	`1010`	`{`
`1013`		`- ZVAL_OBJ(zobject, ZEND_CLOSURE_OBJECT(fci_cache->function_handler));`
`1014`		`- zval_ptr_dtor(zobject);`
	`1011`	`+ OBJ_RELEASE(ZEND_CLOSURE_OBJECT(fci_cache->function_handler));`
`1015`	`1012`	`}`
`1016`	`1013`	`}`
`1017`	`1014`