Skip to content

Commit 1314ccb

Browse files
nikicnikic
committed
Cache __unserialize() instead of unserialize()
We should use these cache slots for the new object serialization mechanism rather than the old one.
1 parent b6deace commit 1314ccb

File tree

11 files changed

+54
-70
lines changed

11 files changed

+54
-70
lines changed

‎Zend/zend.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ struct _zend_class_entry {
140140
zend_function *__callstatic;
141141
zend_function *__tostring;
142142
zend_function *__debugInfo;
143-
zend_function *serialize_func;
144-
zend_function *unserialize_func;
143+
zend_function *__serialize;
144+
zend_function *__unserialize;
145145

146146
/* allocated only if class implements Iterator or IteratorAggregate interface */
147147
zend_class_iterator_funcs *iterator_funcs_ptr;

‎Zend/zend_API.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
20562056
int count=0, unload=0;
20572057
HashTable *target_function_table = function_table;
20582058
int error_type;
2059-
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_func = NULL, *unserialize_func = NULL;
2059+
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;
20602060
zend_string *lowercase_name;
20612061
size_t fname_len;
20622062
const char *lc_class_name = NULL;
@@ -2222,11 +2222,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
22222222

22232223
if (scope) {
22242224
/* Look for ctor, dtor, clone */
2225-
if (zend_string_equals_literal(lowercase_name, "serialize")) {
2226-
serialize_func = reg_function;
2227-
} else if (zend_string_equals_literal(lowercase_name, "unserialize")) {
2228-
unserialize_func = reg_function;
2229-
} else if (ZSTR_VAL(lowercase_name)[0] != '_' || ZSTR_VAL(lowercase_name)[1] != '_') {
2225+
if (ZSTR_VAL(lowercase_name)[0] != '_' || ZSTR_VAL(lowercase_name)[1] != '_') {
22302226
reg_function = NULL;
22312227
} else if (zend_string_equals_literal(lowercase_name, ZEND_CONSTRUCTOR_FUNC_NAME)) {
22322228
ctor = reg_function;
@@ -2257,6 +2253,10 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
22572253
scope->ce_flags |= ZEND_ACC_USE_GUARDS;
22582254
} else if (zend_string_equals_literal(lowercase_name, ZEND_DEBUGINFO_FUNC_NAME)) {
22592255
__debugInfo = reg_function;
2256+
} else if (zend_string_equals_literal(lowercase_name, "__serialize")) {
2257+
__serialize = reg_function;
2258+
} else if (zend_string_equals_literal(lowercase_name, "__unserialize")) {
2259+
__unserialize = reg_function;
22602260
} else {
22612261
reg_function = NULL;
22622262
}
@@ -2298,8 +2298,8 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
22982298
scope->__unset = __unset;
22992299
scope->__isset = __isset;
23002300
scope->__debugInfo = __debugInfo;
2301-
scope->serialize_func = serialize_func;
2302-
scope->unserialize_func = unserialize_func;
2301+
scope->__serialize = __serialize;
2302+
scope->__unserialize = __unserialize;
23032303
if (ctor) {
23042304
ctor->common.fn_flags |= ZEND_ACC_CTOR;
23052305
if (ctor->common.fn_flags & ZEND_ACC_STATIC) {

‎Zend/zend_API.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ typedef struct _zend_fcall_info_cache {
250250
class_container.__unset = NULL; \
251251
class_container.__isset = NULL; \
252252
class_container.__debugInfo = NULL; \
253-
class_container.serialize_func = NULL; \
254-
class_container.unserialize_func = NULL; \
253+
class_container.__serialize = NULL; \
254+
class_container.__unserialize = NULL; \
255255
class_container.parent = NULL; \
256256
class_container.num_interfaces = 0; \
257257
class_container.trait_names = NULL; \

‎Zend/zend_compile.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,6 +1835,9 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify
18351835
ce->__call = NULL;
18361836
ce->__callstatic = NULL;
18371837
ce->__tostring = NULL;
1838+
ce->__serialize = NULL;
1839+
ce->__unserialize = NULL;
1840+
ce->__debugInfo = NULL;
18381841
ce->create_object = NULL;
18391842
ce->get_iterator = NULL;
18401843
ce->iterator_funcs_ptr = NULL;
@@ -1849,9 +1852,6 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, zend_bool nullify
18491852
ce->trait_precedences = NULL;
18501853
ce->serialize = NULL;
18511854
ce->unserialize = NULL;
1852-
ce->serialize_func = NULL;
1853-
ce->unserialize_func = NULL;
1854-
ce->__debugInfo = NULL;
18551855
if (ce->type == ZEND_INTERNAL_CLASS) {
18561856
ce->info.internal.module = NULL;
18571857
ce->info.internal.builtin_functions = NULL;
@@ -6256,11 +6256,7 @@ zend_string *zend_begin_method_decl(zend_op_array *op_array, zend_string *name,
62566256
ZSTR_VAL(ce->name), ZSTR_VAL(name));
62576257
}
62586258

6259-
if (zend_string_equals_literal(lcname, "serialize")) {
6260-
ce->serialize_func = (zend_function *) op_array;
6261-
} else if (zend_string_equals_literal(lcname, "unserialize")) {
6262-
ce->unserialize_func = (zend_function *) op_array;
6263-
} else if (ZSTR_VAL(lcname)[0] != '_' || ZSTR_VAL(lcname)[1] != '_') {
6259+
if (ZSTR_VAL(lcname)[0] != '_' || ZSTR_VAL(lcname)[1] != '_') {
62646260
/* pass */
62656261
} else if (zend_string_equals_literal(lcname, ZEND_CONSTRUCTOR_FUNC_NAME)) {
62666262
ce->constructor = (zend_function *) op_array;
@@ -6301,8 +6297,10 @@ zend_string *zend_begin_method_decl(zend_op_array *op_array, zend_string *name,
63016297
ce->__debugInfo = (zend_function *) op_array;
63026298
} else if (zend_string_equals_literal(lcname, "__serialize")) {
63036299
zend_check_magic_method_attr(fn_flags, ce, "__serialize", 0);
6300+
ce->__serialize = (zend_function *) op_array;
63046301
} else if (zend_string_equals_literal(lcname, "__unserialize")) {
63056302
zend_check_magic_method_attr(fn_flags, ce, "__unserialize", 0);
6303+
ce->__unserialize = (zend_function *) op_array;
63066304
} else if (zend_string_equals_literal(lcname, "__set_state")) {
63076305
zend_check_magic_method_attr(fn_flags, ce, "__set_state", 1);
63086306
}

‎Zend/zend_inheritance.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ static void do_inherit_parent_constructor(zend_class_entry *ce) /* {{{ */
167167
if (EXPECTED(!ce->clone)) {
168168
ce->clone = parent->clone;
169169
}
170-
if (EXPECTED(!ce->serialize_func)) {
171-
ce->serialize_func = parent->serialize_func;
170+
if (EXPECTED(!ce->__serialize)) {
171+
ce->__serialize = parent->__serialize;
172+
}
173+
if (EXPECTED(!ce->__unserialize)) {
174+
ce->__unserialize = parent->__unserialize;
172175
}
173176
if (EXPECTED(!ce->serialize)) {
174177
ce->serialize = parent->serialize;
175178
}
176-
if (EXPECTED(!ce->unserialize_func)) {
177-
ce->unserialize_func = parent->unserialize_func;
178-
}
179179
if (EXPECTED(!ce->unserialize)) {
180180
ce->unserialize = parent->unserialize;
181181
}
@@ -1557,11 +1557,7 @@ static void zend_do_implement_interfaces(zend_class_entry *ce, zend_class_entry
15571557

15581558
static void zend_add_magic_methods(zend_class_entry* ce, zend_string* mname, zend_function* fe) /* {{{ */
15591559
{
1560-
if (zend_string_equals_literal(mname, "serialize")) {
1561-
ce->serialize_func = fe;
1562-
} else if (zend_string_equals_literal(mname, "unserialize")) {
1563-
ce->unserialize_func = fe;
1564-
} else if (ZSTR_VAL(mname)[0] != '_' || ZSTR_VAL(mname)[1] != '_') {
1560+
if (ZSTR_VAL(mname)[0] != '_' || ZSTR_VAL(mname)[1] != '_') {
15651561
/* pass */
15661562
} else if (zend_string_equals_literal(mname, ZEND_CLONE_FUNC_NAME)) {
15671563
ce->clone = fe;
@@ -1589,6 +1585,10 @@ static void zend_add_magic_methods(zend_class_entry* ce, zend_string* mname, zen
15891585
ce->__tostring = fe;
15901586
} else if (zend_string_equals_literal(mname, ZEND_DEBUGINFO_FUNC_NAME)) {
15911587
ce->__debugInfo = fe;
1588+
} else if (zend_string_equals_literal(mname, "__serialize")) {
1589+
ce->__serialize = fe;
1590+
} else if (zend_string_equals_literal(mname, "__unserialize")) {
1591+
ce->__unserialize = fe;
15921592
}
15931593
}
15941594
/* }}} */

‎Zend/zend_interfaces.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,8 @@ ZEND_API int zend_user_serialize(zval *object, unsigned char **buffer, size_t *b
357357
zval retval;
358358
int result;
359359

360-
zend_call_known_instance_method_with_0_params(ce->serialize_func, Z_OBJ_P(object), &retval);
360+
zend_call_method_with_0_params(
361+
Z_OBJ_P(object), Z_OBJCE_P(object), NULL, "serialize", &retval);
361362

362363
if (Z_TYPE(retval) == IS_UNDEF || EG(exception)) {
363364
result = FAILURE;
@@ -396,8 +397,8 @@ ZEND_API int zend_user_unserialize(zval *object, zend_class_entry *ce, const uns
396397
}
397398

398399
ZVAL_STRINGL(&zdata, (char*)buf, buf_len);
399-
zend_call_known_instance_method_with_1_params(
400-
ce->unserialize_func, Z_OBJ_P(object), NULL, &zdata);
400+
zend_call_method_with_1_params(
401+
Z_OBJ_P(object), Z_OBJCE_P(object), NULL, "unserialize", NULL, &zdata);
401402
zval_ptr_dtor(&zdata);
402403

403404
if (EG(exception)) {

‎ext/opcache/zend_accelerator_util_funcs.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,17 +369,13 @@ static void zend_class_copy_ctor(zend_class_entry **pce)
369369
zend_update_inherited_handler(__get);
370370
zend_update_inherited_handler(__set);
371371
zend_update_inherited_handler(__call);
372-
/* 5.1 stuff */
373-
zend_update_inherited_handler(serialize_func);
374-
zend_update_inherited_handler(unserialize_func);
375372
zend_update_inherited_handler(__isset);
376373
zend_update_inherited_handler(__unset);
377-
/* 5.2 stuff */
378374
zend_update_inherited_handler(__tostring);
379-
380-
/* 5.3 stuff */
381375
zend_update_inherited_handler(__callstatic);
382376
zend_update_inherited_handler(__debugInfo);
377+
zend_update_inherited_handler(__serialize);
378+
zend_update_inherited_handler(__unserialize);
383379

384380
/* 5.4 traits */
385381
if (ce->num_traits) {

‎ext/opcache/zend_file_cache.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -827,8 +827,8 @@ static void zend_file_cache_serialize_class(zval *zv,
827827
SERIALIZE_PTR(ce->__get);
828828
SERIALIZE_PTR(ce->__set);
829829
SERIALIZE_PTR(ce->__call);
830-
SERIALIZE_PTR(ce->serialize_func);
831-
SERIALIZE_PTR(ce->unserialize_func);
830+
SERIALIZE_PTR(ce->__serialize);
831+
SERIALIZE_PTR(ce->__unserialize);
832832
SERIALIZE_PTR(ce->__isset);
833833
SERIALIZE_PTR(ce->__unset);
834834
SERIALIZE_PTR(ce->__tostring);
@@ -1564,8 +1564,8 @@ static void zend_file_cache_unserialize_class(zval *zv,
15641564
UNSERIALIZE_PTR(ce->__get);
15651565
UNSERIALIZE_PTR(ce->__set);
15661566
UNSERIALIZE_PTR(ce->__call);
1567-
UNSERIALIZE_PTR(ce->serialize_func);
1568-
UNSERIALIZE_PTR(ce->unserialize_func);
1567+
UNSERIALIZE_PTR(ce->__serialize);
1568+
UNSERIALIZE_PTR(ce->__unserialize);
15691569
UNSERIALIZE_PTR(ce->__isset);
15701570
UNSERIALIZE_PTR(ce->__unset);
15711571
UNSERIALIZE_PTR(ce->__tostring);

‎ext/opcache/zend_persist.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,16 +1090,16 @@ static void zend_update_parent_ce(zend_class_entry *ce)
10901090
ce->__call = tmp;
10911091
}
10921092
}
1093-
if (ce->serialize_func) {
1094-
zend_function *tmp = zend_shared_alloc_get_xlat_entry(ce->serialize_func);
1093+
if (ce->__serialize) {
1094+
zend_function *tmp = zend_shared_alloc_get_xlat_entry(ce->__serialize);
10951095
if (tmp != NULL) {
1096-
ce->serialize_func = tmp;
1096+
ce->__serialize = tmp;
10971097
}
10981098
}
1099-
if (ce->unserialize_func) {
1100-
zend_function *tmp = zend_shared_alloc_get_xlat_entry(ce->unserialize_func);
1099+
if (ce->__unserialize) {
1100+
zend_function *tmp = zend_shared_alloc_get_xlat_entry(ce->__unserialize);
11011101
if (tmp != NULL) {
1102-
ce->unserialize_func = tmp;
1102+
ce->__unserialize = tmp;
11031103
}
11041104
}
11051105
if (ce->__isset) {

‎ext/standard/var.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -743,16 +743,12 @@ static int php_var_serialize_call_sleep(zval *retval, zval *struc) /* {{{ */
743743

744744
static int php_var_serialize_call_magic_serialize(zval *retval, zval *obj) /* {{{ */
745745
{
746-
zval fname;
747-
int res;
748-
749-
ZVAL_STRINGL(&fname, "__serialize", sizeof("__serialize") - 1);
750746
BG(serialize_lock)++;
751-
res = call_user_function(CG(function_table), obj, &fname, retval, 0, 0);
747+
zend_call_known_instance_method_with_0_params(
748+
Z_OBJCE_P(obj)->__serialize, Z_OBJ_P(obj), retval);
752749
BG(serialize_lock)--;
753-
zval_ptr_dtor_str(&fname);
754750

755-
if (res == FAILURE || Z_ISUNDEF_P(retval)) {
751+
if (EG(exception)) {
756752
zval_ptr_dtor(retval);
757753
return FAILURE;
758754
}
@@ -995,7 +991,7 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
995991
zend_bool incomplete_class;
996992
uint32_t count;
997993

998-
if (zend_hash_str_exists(&ce->function_table, "__serialize", sizeof("__serialize")-1)) {
994+
if (ce->__serialize) {
999995
zval retval, obj;
1000996
zend_string *key;
1001997
zval *data;

‎ext/standard/var_unserializer.re

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,8 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
218218
var_entries *var_hash = (*var_hashx)->entries.next;
219219
var_dtor_entries *var_dtor_hash = (*var_hashx)->first_dtor;
220220
zend_bool delayed_call_failed = 0;
221-
zval wakeup_name, unserialize_name;
221+
zval wakeup_name;
222222
ZVAL_UNDEF(&wakeup_name);
223-
ZVAL_UNDEF(&unserialize_name);
224223

225224
#if VAR_ENTRIES_DBG
226225
fprintf(stderr, "var_destroy( " ZEND_LONG_FMT ")\n", var_hash?var_hash->used_slots:-1L);
@@ -261,22 +260,18 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
261260
} else if (Z_EXTRA_P(zv) == VAR_UNSERIALIZE_FLAG) {
262261
/* Perform delayed __unserialize calls */
263262
if (!delayed_call_failed) {
264-
zval retval, param;
263+
zval param;
265264
ZVAL_COPY(&param, &var_dtor_hash->data[i + 1]);
266265

267-
if (Z_ISUNDEF(unserialize_name)) {
268-
ZVAL_STRINGL(&unserialize_name, "__unserialize", sizeof("__unserialize") - 1);
269-
}
270-
271266
BG(serialize_lock)++;
272-
if (call_user_function(CG(function_table), zv, &unserialize_name, &retval, 1, &param) == FAILURE || Z_ISUNDEF(retval)) {
267+
zend_call_known_instance_method_with_1_params(
268+
Z_OBJCE_P(zv)->__unserialize, Z_OBJ_P(zv), NULL, &param);
269+
if (EG(exception)) {
273270
delayed_call_failed = 1;
274271
GC_ADD_FLAGS(Z_OBJ_P(zv), IS_OBJ_DESTRUCTOR_CALLED);
275272
}
276273
BG(serialize_lock)--;
277-
278274
zval_ptr_dtor(&param);
279-
zval_ptr_dtor(&retval);
280275
} else {
281276
GC_ADD_FLAGS(Z_OBJ_P(zv), IS_OBJ_DESTRUCTOR_CALLED);
282277
}
@@ -290,7 +285,6 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
290285
}
291286

292287
zval_ptr_dtor_nogc(&wakeup_name);
293-
zval_ptr_dtor_nogc(&unserialize_name);
294288

295289
if ((*var_hashx)->ref_props) {
296290
zend_hash_destroy((*var_hashx)->ref_props);
@@ -1169,8 +1163,7 @@ object ":" uiv ":" ["] {
11691163

11701164
*p += 2;
11711165

1172-
has_unserialize = !incomplete_class
1173-
&& zend_hash_str_exists(&ce->function_table, "__unserialize", sizeof("__unserialize")-1);
1166+
has_unserialize = !incomplete_class && ce->__unserialize;
11741167

11751168
/* If this class implements Serializable, it should not land here but in object_custom().
11761169
* The passed string obviously doesn't descend from the regular serializer. However, if

0 commit comments

Comments
 (0)