diff options
| author | Nikita Popov <nikic@php.net> | 2016-09-22 12:34:55 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-09-22 12:34:55 +0200 |
| commit | 7cd2494bb8a2379a116f0b895438c2fd7166b29f (patch) | |
| tree | 2ccee12c1848919d44f91d0bd2cf86c13408c4f7 /Zend/zend_inheritance.c | |
| parent | d4144a6ec93485076ee93dd1316bb2c2c691a6e2 (diff) | |
| parent | 8e313becf4190a8cdc4ef52a1efdbce475f51ae0 (diff) | |
| download | php-git-7cd2494bb8a2379a116f0b895438c2fd7166b29f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index a76fb6c285..47f6eb2e0d 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1227,6 +1227,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s function_add_ref(fn); new_fn = zend_arena_alloc(&CG(arena), sizeof(zend_op_array)); memcpy(new_fn, fn, sizeof(zend_op_array)); + new_fn->common.fn_flags |= ZEND_ACC_ARENA_ALLOCATED; fn = zend_hash_update_ptr(&ce->function_table, key, new_fn); zend_add_magic_methods(ce, key, fn); } |