archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use Z_PARAM_OBJ macros when zval isn't needed

Browse source 
In some cases, like spl_object_id, the code is simpler but equally efficient
after optimizations.

In other cases, like get_mangled_object_vars(), the compiler can't infer that
the object in the zval won't change.

Closes GH-6567
This commit is contained in:
Tyson Andre 2021-01-02 14:07:45 -05:00
parent 64c753e7c8
commit dfb9e03336
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Zend/zend_builtin_functions.c
View file

@ -769,7 +769,6 @@ ZEND_FUNCTION(get_class_vars)
/* {{{ Returns an array of object properties */ /* {{{ Returns an array of object properties */
ZEND_FUNCTION(get_object_vars) ZEND_FUNCTION(get_object_vars)
{ {
zval *obj;
zval *value; zval *value;
HashTable *properties; HashTable *properties;
zend_string *key; zend_string *key;
@ -777,10 +776,9 @@ ZEND_FUNCTION(get_object_vars)
zend_ulong num_key; zend_ulong num_key;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_OBJECT(obj) Z_PARAM_OBJ(zobj)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
zobj = Z_OBJ_P(obj);
properties = zobj->handlers->get_properties(zobj); properties = zobj->handlers->get_properties(zobj);
if (properties == NULL) { if (properties == NULL) {
RETURN_EMPTY_ARRAY(); RETURN_EMPTY_ARRAY();
@ -839,22 +837,22 @@ ZEND_FUNCTION(get_object_vars)
/* {{{ Returns an array of mangled object properties. Does not respect property visibility. */ /* {{{ Returns an array of mangled object properties. Does not respect property visibility. */
ZEND_FUNCTION(get_mangled_object_vars) ZEND_FUNCTION(get_mangled_object_vars)
{ {
zval *obj; zend_object *obj;
HashTable *properties; HashTable *properties;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_OBJECT(obj) Z_PARAM_OBJ(obj)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
properties = Z_OBJ_HT_P(obj)->get_properties(Z_OBJ_P(obj)); properties = obj->handlers->get_properties(obj);
if (!properties) { if (!properties) {
ZVAL_EMPTY_ARRAY(return_value); ZVAL_EMPTY_ARRAY(return_value);
return; return;
} }
properties = zend_proptable_to_symtable(properties, properties = zend_proptable_to_symtable(properties,
(Z_OBJCE_P(obj)->default_properties_count || (obj->ce->default_properties_count ||
Z_OBJ_P(obj)->handlers != &std_object_handlers || obj->handlers != &std_object_handlers ||
GC_IS_RECURSIVE(properties))); GC_IS_RECURSIVE(properties)));
RETURN_ARR(properties); RETURN_ARR(properties);
} }

12
Zend/zend_closures.c
View file

@ -128,6 +128,7 @@ ZEND_METHOD(Closure, call)
zend_fcall_info_cache fci_cache; zend_fcall_info_cache fci_cache;
zend_function my_function; zend_function my_function;
zend_object *newobj; zend_object *newobj;
zend_class_entry *newclass;
fci.param_count = 0; fci.param_count = 0;
fci.params = NULL; fci.params = NULL;
@ -140,26 +141,27 @@ ZEND_METHOD(Closure, call)
closure = (zend_closure *) Z_OBJ_P(ZEND_THIS); closure = (zend_closure *) Z_OBJ_P(ZEND_THIS);
newobj = Z_OBJ_P(newthis); newobj = Z_OBJ_P(newthis);
newclass = newobj->ce;
if (!zend_valid_closure_binding(closure, newthis, Z_OBJCE_P(newthis))) { if (!zend_valid_closure_binding(closure, newthis, newclass)) {
return; return;
} }
if (closure->func.common.fn_flags & ZEND_ACC_GENERATOR) { if (closure->func.common.fn_flags & ZEND_ACC_GENERATOR) {
zval new_closure; zval new_closure;
zend_create_closure(&new_closure, &closure->func, Z_OBJCE_P(newthis), closure->called_scope, newthis); zend_create_closure(&new_closure, &closure->func, newclass, closure->called_scope, newthis);
closure = (zend_closure *) Z_OBJ(new_closure); closure = (zend_closure *) Z_OBJ(new_closure);
fci_cache.function_handler = &closure->func; fci_cache.function_handler = &closure->func;
} else { } else {
memcpy(&my_function, &closure->func, closure->func.type == ZEND_USER_FUNCTION ? sizeof(zend_op_array) : sizeof(zend_internal_function)); memcpy(&my_function, &closure->func, closure->func.type == ZEND_USER_FUNCTION ? sizeof(zend_op_array) : sizeof(zend_internal_function));
my_function.common.fn_flags &= ~ZEND_ACC_CLOSURE; my_function.common.fn_flags &= ~ZEND_ACC_CLOSURE;
/* use scope of passed object */ /* use scope of passed object */
my_function.common.scope = Z_OBJCE_P(newthis); my_function.common.scope = newclass;
fci_cache.function_handler = &my_function; fci_cache.function_handler = &my_function;
/* Runtime cache relies on bound scope to be immutable, hence we need a separate rt cache in case scope changed */ /* Runtime cache relies on bound scope to be immutable, hence we need a separate rt cache in case scope changed */
if (ZEND_USER_CODE(my_function.type) if (ZEND_USER_CODE(my_function.type)
&& (closure->func.common.scope != Z_OBJCE_P(newthis) && (closure->func.common.scope != newclass
|| (closure->func.common.fn_flags & ZEND_ACC_HEAP_RT_CACHE))) { || (closure->func.common.fn_flags & ZEND_ACC_HEAP_RT_CACHE))) {
void *ptr; void *ptr;
@ -172,7 +174,7 @@ ZEND_METHOD(Closure, call)
} }
} }
fci_cache.called_scope = newobj->ce; fci_cache.called_scope = newclass;
fci_cache.object = fci.object = newobj; fci_cache.object = fci.object = newobj;
fci.size = sizeof(fci); fci.size = sizeof(fci);

12
Zend/zend_weakrefs.c
View file

@ -181,8 +181,8 @@ static zend_object* zend_weakref_new(zend_class_entry *ce) {
return &wr->std; return &wr->std;
} }
static zend_always_inline zend_bool zend_weakref_find(zval *referent, zval *return_value) { static zend_always_inline zend_bool zend_weakref_find(zend_object *referent, zval *return_value) {
void *tagged_ptr = zend_hash_index_find_ptr(&EG(weakrefs), (zend_ulong) Z_OBJ_P(referent)); void *tagged_ptr = zend_hash_index_find_ptr(&EG(weakrefs), (zend_ulong) referent);
if (!tagged_ptr) { if (!tagged_ptr) {
return 0; return 0;
} }
@ -209,13 +209,13 @@ found_weakref:
return 0; return 0;
} }
static zend_always_inline void zend_weakref_create(zval *referent, zval *return_value) { static zend_always_inline void zend_weakref_create(zend_object *referent, zval *return_value) {
zend_weakref *wr; zend_weakref *wr;
object_init_ex(return_value, zend_ce_weakref); object_init_ex(return_value, zend_ce_weakref);
wr = zend_weakref_fetch(return_value); wr = zend_weakref_fetch(return_value);
wr->referent = Z_OBJ_P(referent); wr->referent = referent;
zend_weakref_register(wr->referent, ZEND_WEAKREF_ENCODE(wr, ZEND_WEAKREF_TAG_REF)); zend_weakref_register(wr->referent, ZEND_WEAKREF_ENCODE(wr, ZEND_WEAKREF_TAG_REF));
} }
@ -245,10 +245,10 @@ ZEND_COLD ZEND_METHOD(WeakReference, __construct)
ZEND_METHOD(WeakReference, create) ZEND_METHOD(WeakReference, create)
{ {
zval *referent; zend_object *referent;
ZEND_PARSE_PARAMETERS_START(1,1) ZEND_PARSE_PARAMETERS_START(1,1)
Z_PARAM_OBJECT(referent) Z_PARAM_OBJ(referent)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
if (zend_weakref_find(referent, return_value)) { if (zend_weakref_find(referent, return_value)) {

6
ext/spl/php_spl.c
View file

@ -641,13 +641,13 @@ PHP_FUNCTION(spl_object_hash)
/* {{{ Returns the integer object handle for the given object */ /* {{{ Returns the integer object handle for the given object */
PHP_FUNCTION(spl_object_id) PHP_FUNCTION(spl_object_id)
{ {
zval *obj; zend_object *obj;
ZEND_PARSE_PARAMETERS_START(1, 1) ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_OBJECT(obj) Z_PARAM_OBJ(obj)
ZEND_PARSE_PARAMETERS_END(); ZEND_PARSE_PARAMETERS_END();
RETURN_LONG((zend_long)Z_OBJ_HANDLE_P(obj)); RETURN_LONG((zend_long)obj->handle);
} }
/* }}} */ /* }}} */