Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed reference-countingin ZTS build.

1 files changed, 1 insertions, 1 deletions

diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 2b41f109cd..2d51ed150e 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -1209,12 +1209,12 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
 		}
 	}
 
+	function_add_ref(fn);
 	if (UNEXPECTED(fn->type == ZEND_INTERNAL_FUNCTION)) {
 		new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_internal_function));
 		memcpy(new_fn, fn, sizeof(zend_internal_function));
 		new_fn->common.fn_flags |= ZEND_ACC_ARENA_ALLOCATED;
 	} else {
-		function_add_ref(fn);
 		new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
 		memcpy(new_fn, fn, sizeof(zend_op_array));
 	}