archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Directly assign magic methods

Browse source 
Instead of going through intermediary variables.
This commit is contained in:
Nikita Popov 2020-07-20 11:22:47 +02:00
parent 91e5452b95
commit efce3694b7
1 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Zend/zend_API.c
View file

@ -2147,7 +2147,6 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
int count=0, unload=0; int count=0, unload=0;
HashTable *target_function_table = function_table; HashTable *target_function_table = function_table;
int error_type; int error_type;
zend_function *ctor = NULL, *dtor = NULL, *clone = NULL, *__get = NULL, *__set = NULL, *__unset = NULL, *__isset = NULL, *__call = NULL, *__callstatic = NULL, *__tostring = NULL, *__debugInfo = NULL, *__serialize = NULL, *__unserialize = NULL;
zend_string *lowercase_name; zend_string *lowercase_name;
size_t fname_len; size_t fname_len;
@ -2299,36 +2298,36 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
if (ZSTR_VAL(lowercase_name)[0] != '_' || ZSTR_VAL(lowercase_name)[1] != '_') { if (ZSTR_VAL(lowercase_name)[0] != '_' || ZSTR_VAL(lowercase_name)[1] != '_') {
reg_function = NULL; reg_function = NULL;
} else if (zend_string_equals_literal(lowercase_name, ZEND_CONSTRUCTOR_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_CONSTRUCTOR_FUNC_NAME)) {
ctor = reg_function; scope->constructor = reg_function;
ctor->common.fn_flags |= ZEND_ACC_CTOR; scope->constructor->common.fn_flags |= ZEND_ACC_CTOR;
} else if (zend_string_equals_literal(lowercase_name, ZEND_DESTRUCTOR_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_DESTRUCTOR_FUNC_NAME)) {
dtor = reg_function; scope->destructor = reg_function;
} else if (zend_string_equals_literal(lowercase_name, ZEND_CLONE_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_CLONE_FUNC_NAME)) {
clone = reg_function; scope->clone = reg_function;
} else if (zend_string_equals_literal(lowercase_name, ZEND_CALL_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_CALL_FUNC_NAME)) {
__call = reg_function; scope->__call = reg_function;
} else if (zend_string_equals_literal(lowercase_name, ZEND_CALLSTATIC_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_CALLSTATIC_FUNC_NAME)) {
__callstatic = reg_function; scope->__callstatic = reg_function;
} else if (zend_string_equals_literal(lowercase_name, ZEND_TOSTRING_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_TOSTRING_FUNC_NAME)) {
__tostring = reg_function; scope->__tostring = reg_function;
} else if (zend_string_equals_literal(lowercase_name, ZEND_GET_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_GET_FUNC_NAME)) {
__get = reg_function; scope->__get = reg_function;
scope->ce_flags |= ZEND_ACC_USE_GUARDS; scope->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lowercase_name, ZEND_SET_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_SET_FUNC_NAME)) {
__set = reg_function; scope->__set = reg_function;
scope->ce_flags |= ZEND_ACC_USE_GUARDS; scope->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lowercase_name, ZEND_UNSET_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_UNSET_FUNC_NAME)) {
__unset = reg_function; scope->__unset = reg_function;
scope->ce_flags |= ZEND_ACC_USE_GUARDS; scope->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lowercase_name, ZEND_ISSET_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_ISSET_FUNC_NAME)) {
__isset = reg_function; scope->__isset = reg_function;
scope->ce_flags |= ZEND_ACC_USE_GUARDS; scope->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lowercase_name, ZEND_DEBUGINFO_FUNC_NAME)) { } else if (zend_string_equals_literal(lowercase_name, ZEND_DEBUGINFO_FUNC_NAME)) {
__debugInfo = reg_function; scope->__debugInfo = reg_function;
} else if (zend_string_equals_literal(lowercase_name, "__serialize")) { } else if (zend_string_equals_literal(lowercase_name, "__serialize")) {
__serialize = reg_function; scope->__serialize = reg_function;
} else if (zend_string_equals_literal(lowercase_name, "__unserialize")) { } else if (zend_string_equals_literal(lowercase_name, "__unserialize")) {
__unserialize = reg_function; scope->__unserialize = reg_function;
} else { } else {
reg_function = NULL; reg_function = NULL;
} }
@ -2355,21 +2354,6 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
zend_unregister_functions(functions, count, target_function_table); zend_unregister_functions(functions, count, target_function_table);
return FAILURE; return FAILURE;
} }
if (scope) {
scope->constructor = ctor;
scope->destructor = dtor;
scope->clone = clone;
scope->__call = __call;
scope->__callstatic = __callstatic;
scope->__tostring = __tostring;
scope->__get = __get;
scope->__set = __set;
scope->__unset = __unset;
scope->__isset = __isset;
scope->__debugInfo = __debugInfo;
scope->__serialize = __serialize;
scope->__unserialize = __unserialize;
}
return SUCCESS; return SUCCESS;
} }
/* }}} */ /* }}} */