diff options
| -rw-r--r-- | Zend/zend_API.c | 2 | ||||
| -rw-r--r-- | Zend/zend_execute.h | 2 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.c | 9 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.h | 2 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 2 |
5 files changed, 3 insertions, 14 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index f5c60aacd0..b9e6cc1002 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -198,7 +198,7 @@ ZEND_API char *zend_zval_type_name(const zval *arg) /* {{{ */ ZEND_API zend_class_entry *zend_get_class_entry(const zend_object *zobject TSRMLS_DC) /* {{{ */ { - return zobject->handlers->get_class_entry(zobject TSRMLS_CC); + return zobject->ce; } /* }}} */ diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index a77446adb0..370c71de74 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -287,7 +287,7 @@ void zend_shutdown_timeout_thread(void); /* The following tries to resolve the classname of a zval of type object. * Since it is slow it should be only used in error messages. */ -#define Z_OBJ_CLASS_NAME_P(obj) ((obj) ? (obj)->handlers->get_class_entry(obj TSRMLS_CC)->name->val : "") +#define Z_OBJ_CLASS_NAME_P(obj) ((obj) ? (obj)->ce->name->val : "") ZEND_API zval* zend_get_compiled_variable_value(const zend_execute_data *execute_data_ptr, uint32_t var); diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 9b7e579ea3..c02cda64b9 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1089,7 +1089,7 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr, zend_str /* Ensure that if we're calling a private function, we're allowed to do so. * If we're not and __call() handler exists, invoke it, otherwise error out. */ - updated_fbc = zend_check_private_int(fbc, zobj->handlers->get_class_entry(zobj TSRMLS_CC), lc_method_name TSRMLS_CC); + updated_fbc = zend_check_private_int(fbc, zobj->ce, lc_method_name TSRMLS_CC); if (EXPECTED(updated_fbc != NULL)) { fbc = updated_fbc; } else { @@ -1525,12 +1525,6 @@ exit: } /* }}} */ -zend_class_entry *zend_std_object_get_class(const zend_object *object TSRMLS_DC) /* {{{ */ -{ - return object->ce; -} -/* }}} */ - zend_string* zend_std_object_get_class_name(const zend_object *zobj, int parent TSRMLS_DC) /* {{{ */ { zend_class_entry *ce; @@ -1660,7 +1654,6 @@ ZEND_API zend_object_handlers std_object_handlers = { zend_std_get_method, /* get_method */ NULL, /* call_method */ zend_std_get_constructor, /* get_constructor */ - zend_std_object_get_class, /* get_class_entry */ zend_std_object_get_class_name, /* get_class_name */ zend_std_compare_objects, /* compare_objects */ zend_std_cast_object_tostring, /* cast_object */ diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h index 14b13be308..623282b43d 100644 --- a/Zend/zend_object_handlers.h +++ b/Zend/zend_object_handlers.h @@ -95,7 +95,6 @@ typedef void (*zend_object_dtor_obj_t)(zend_object *object TSRMLS_DC); typedef void (*zend_object_free_obj_t)(zend_object *object TSRMLS_DC); typedef zend_object* (*zend_object_clone_obj_t)(zval *object TSRMLS_DC); -typedef zend_class_entry *(*zend_object_get_class_entry_t)(const zend_object *object TSRMLS_DC); typedef zend_string *(*zend_object_get_class_name_t)(const zend_object *object, int parent TSRMLS_DC); typedef int (*zend_object_compare_t)(zval *object1, zval *object2 TSRMLS_DC); typedef int (*zend_object_compare_zvals_t)(zval *resul, zval *op1, zval *op2 TSRMLS_DC); @@ -137,7 +136,6 @@ struct _zend_object_handlers { zend_object_get_method_t get_method; zend_object_call_method_t call_method; zend_object_get_constructor_t get_constructor; - zend_object_get_class_entry_t get_class_entry; zend_object_get_class_name_t get_class_name; zend_object_compare_t compare_objects; zend_object_cast_t cast_object; diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 366a6f0d3b..ba70ecca9d 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1958,7 +1958,6 @@ static zend_object_handlers sxe_object_handlers = { /* {{{ */ NULL, /* zend_get_std_object_handlers()->get_method,*/ NULL, /* zend_get_std_object_handlers()->call_method,*/ NULL, /* zend_get_std_object_handlers()->get_constructor, */ - NULL, /* zend_get_std_object_handlers()->get_class_entry,*/ NULL, /* zend_get_std_object_handlers()->get_class_name,*/ sxe_objects_compare, sxe_object_cast, @@ -2580,7 +2579,6 @@ PHP_MINIT_FUNCTION(simplexml) sxe_object_handlers.clone_obj = sxe_object_clone; sxe_object_handlers.get_method = zend_get_std_object_handlers()->get_method; sxe_object_handlers.get_constructor = zend_get_std_object_handlers()->get_constructor; - sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry; sxe_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name; sxe_class_entry->serialize = zend_class_serialize_deny; sxe_class_entry->unserialize = zend_class_unserialize_deny; |