From 8361c0a9a7bfe712c14628b575ad202fb3868eeb Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 6 Jul 2018 01:24:15 +0300 Subject: [PATCH] Avoid useless checks in object_init() --- Zend/zend_API.c | 5 +++-- Zend/zend_API.h | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 1699f1b50a..f1f6a75e50 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1345,9 +1345,10 @@ ZEND_API int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND_FILE_L } /* }}} */ -ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC) /* {{{ */ +ZEND_API int object_init(zval *arg) /* {{{ */ { - return _object_init_ex(arg, zend_standard_class_def ZEND_FILE_LINE_RELAY_CC); + ZVAL_OBJ(arg, zend_objects_new(zend_standard_class_def)); + return SUCCESS; } /* }}} */ diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 63c82a4b06..ac589d48e9 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -378,10 +378,9 @@ ZEND_API char *zend_get_type_by_const(int type); #define array_init(arg) ZVAL_ARR((arg), zend_new_array(0)) #define array_init_size(arg, size) ZVAL_ARR((arg), zend_new_array(size)) -#define object_init(arg) _object_init((arg) ZEND_FILE_LINE_CC) #define object_init_ex(arg, ce) _object_init_ex((arg), (ce) ZEND_FILE_LINE_CC) #define object_and_properties_init(arg, ce, properties) _object_and_properties_init((arg), (ce), (properties) ZEND_FILE_LINE_CC) -ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC); +ZEND_API int object_init(zval *arg); ZEND_API int _object_init_ex(zval *arg, zend_class_entry *ce ZEND_FILE_LINE_DC); ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *ce, HashTable *properties ZEND_FILE_LINE_DC); ZEND_API void object_properties_init(zend_object *object, zend_class_entry *class_type); -- 2.40.0