diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-28 13:59:07 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-28 13:59:07 +0800 |
| commit | a5ce7d526e77a7d0cce650c7b2c09a1c31ad39bb (patch) | |
| tree | b1e27e3de1c7f79ddbd25f8383e8681eac33962b /Zend | |
| parent | 32311747496da82069017649590e0fec801443c2 (diff) | |
| download | php-git-a5ce7d526e77a7d0cce650c7b2c09a1c31ad39bb.tar.gz | |
Revert "Move zend_objects_store_put out of zend_object_std_init"
This reverts commit 8ced4f0ac906fd9a28b968801487630326c45bc8.
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_closures.c | 1 | ||||
| -rw-r--r-- | Zend/zend_generators.c | 1 | ||||
| -rw-r--r-- | Zend/zend_objects.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 00555564a3..46894c6106 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -254,7 +254,6 @@ static zend_object *zend_closure_new(zend_class_entry *class_type TSRMLS_DC) /* zend_object_std_init(&closure->std, class_type TSRMLS_CC); closure->std.handlers = &closure_handlers; - zend_objects_store_put(&closure->std); return (zend_object*)closure; } diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index b163646970..7bdebf6a7b 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -222,7 +222,6 @@ static zend_object *zend_generator_create(zend_class_entry *class_type TSRMLS_DC generator->largest_used_integer_key = -1; zend_object_std_init(&generator->std, class_type TSRMLS_CC); - zend_objects_store_put(&generator->std TSRMLS_CC); generator->std.handlers = &zend_generator_handlers; return (zend_object*)generator; diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 25f453a7e5..5b6bd5ebb8 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -36,6 +36,7 @@ ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSR object->properties = NULL; object->guards = NULL; memset(object->properties_table, 0, sizeof(zval) * ce->default_properties_count); + zend_objects_store_put(object); } ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC) @@ -132,7 +133,6 @@ ZEND_API zend_object *zend_objects_new(zend_class_entry *ce TSRMLS_DC) zend_object *object = emalloc(sizeof(zend_object) + sizeof(zval) * (ce->default_properties_count - 1)); zend_object_std_init(object, ce); - zend_objects_store_put(object); object->handlers = &std_object_handlers; return object; } |