Skip to content

Commit 5a0b68b

Browse files
bwoebibwoebi
committed
Revert "Store default object handlers alongside the class entry"
This reverts commit 9e6eab3. Reverted along a01dd9f.
1 parent a01dd9f commit 5a0b68b

13 files changed

+58
-35
lines changed

‎Zend/zend.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@ struct _zend_class_entry {
182182
zend_function *__serialize;
183183
zend_function *__unserialize;
184184

185-
const zend_object_handlers *default_object_handlers;
186-
187185
/* allocated only if class implements Iterator or IteratorAggregate interface */
188186
zend_class_iterator_funcs *iterator_funcs_ptr;
189187
/* allocated only if class implements ArrayAccess interface */

‎Zend/zend_API.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,11 @@ typedef struct _zend_fcall_info_cache {
272272
{ \
273273
memset(&class_container, 0, sizeof(zend_class_entry)); \
274274
class_container.name = zend_string_init_interned(class_name, class_name_len, 1); \
275-
class_container.default_object_handlers = &std_object_handlers; \
276275
class_container.info.internal.builtin_functions = functions; \
277276
}
278277

279278
#define INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions) \
280279
{ \
281-
class_container.default_object_handlers = &std_object_handlers; \
282280
class_container.constructor = NULL; \
283281
class_container.destructor = NULL; \
284282
class_container.clone = NULL; \

‎Zend/zend_attributes.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,18 @@ ZEND_METHOD(SensitiveParameterValue, __debugInfo)
131131
RETURN_EMPTY_ARRAY();
132132
}
133133

134+
static zend_object *attributes_sensitive_parameter_value_new(zend_class_entry *ce)
135+
{
136+
zend_object *object;
137+
138+
object = zend_objects_new(ce);
139+
object->handlers = &attributes_object_handlers_sensitive_parameter_value;
140+
141+
object_properties_init(object, ce);
142+
143+
return object;
144+
}
145+
134146
static HashTable *attributes_sensitive_parameter_value_get_properties_for(zend_object *zobj, zend_prop_purpose purpose)
135147
{
136148
return NULL;
@@ -370,7 +382,7 @@ void zend_register_attribute_ce(void)
370382

371383
/* This is not an actual attribute, thus the zend_mark_internal_attribute() call is missing. */
372384
zend_ce_sensitive_parameter_value = register_class_SensitiveParameterValue();
373-
zend_ce_sensitive_parameter_value->default_object_handlers = &attributes_object_handlers_sensitive_parameter_value;
385+
zend_ce_sensitive_parameter_value->create_object = attributes_sensitive_parameter_value_new;
374386
}
375387

376388
void zend_attributes_shutdown(void)

‎Zend/zend_closures.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ static zend_object *zend_closure_new(zend_class_entry *class_type) /* {{{ */
521521
memset(closure, 0, sizeof(zend_closure));
522522

523523
zend_object_std_init(&closure->std, class_type);
524+
closure->std.handlers = &closure_handlers;
524525

525526
return (zend_object*)closure;
526527
}
@@ -677,7 +678,6 @@ void zend_register_closure_ce(void) /* {{{ */
677678
{
678679
zend_ce_closure = register_class_Closure();
679680
zend_ce_closure->create_object = zend_closure_new;
680-
zend_ce_closure->default_object_handlers = &closure_handlers;
681681

682682
memcpy(&closure_handlers, &std_object_handlers, sizeof(zend_object_handlers));
683683
closure_handlers.free_obj = zend_closure_free_storage;

‎Zend/zend_compile.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1829,7 +1829,6 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, bool nullify_hand
18291829
ZEND_MAP_PTR_INIT(ce->static_members_table, NULL);
18301830
ZEND_MAP_PTR_INIT(ce->mutable_data, NULL);
18311831

1832-
ce->default_object_handlers = &std_object_handlers;
18331832
ce->default_properties_count = 0;
18341833
ce->default_static_members_count = 0;
18351834
ce->properties_info_table = NULL;

‎Zend/zend_enum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ zend_object *zend_enum_new(zval *result, zend_class_entry *ce, zend_string *case
4747
ZVAL_COPY(OBJ_PROP_NUM(zobj, 1), backing_value_zv);
4848
}
4949

50+
zobj->handlers = &enum_handlers;
51+
5052
return zobj;
5153
}
5254

@@ -182,8 +184,6 @@ void zend_enum_add_interfaces(zend_class_entry *ce)
182184
ce->interface_names[num_interfaces_before + 1].name = zend_string_copy(zend_ce_backed_enum->name);
183185
ce->interface_names[num_interfaces_before + 1].lc_name = zend_string_init("backedenum", sizeof("backedenum") - 1, 0);
184186
}
185-
186-
ce->default_object_handlers = &enum_handlers;
187187
}
188188

189189
zend_result zend_enum_build_backed_enum_table(zend_class_entry *ce)

‎Zend/zend_exceptions.c

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,21 @@ ZEND_API void zend_clear_exception(void) /* {{{ */
240240
}
241241
/* }}} */
242242

243-
static zend_object *zend_default_exception_new(zend_class_entry *class_type) /* {{{ */
243+
static zend_object *zend_default_exception_new_ex(zend_class_entry *class_type, bool skip_top_traces) /* {{{ */
244244
{
245245
zval tmp;
246246
zval trace;
247247
zend_class_entry *base_ce;
248248
zend_string *filename;
249249

250250
zend_object *object = zend_objects_new(class_type);
251+
object->handlers = &default_exception_handlers;
252+
251253
object_properties_init(object, class_type);
252254

253255
if (EG(current_execute_data)) {
254256
zend_fetch_debug_backtrace(&trace,
255-
0,
257+
skip_top_traces,
256258
EG(exception_ignore_args) ? DEBUG_BACKTRACE_IGNORE_ARGS : 0, 0);
257259
} else {
258260
array_init(&trace);
@@ -280,6 +282,18 @@ static zend_object *zend_default_exception_new(zend_class_entry *class_type) /*
280282
}
281283
/* }}} */
282284

285+
static zend_object *zend_default_exception_new(zend_class_entry *class_type) /* {{{ */
286+
{
287+
return zend_default_exception_new_ex(class_type, 0);
288+
}
289+
/* }}} */
290+
291+
static zend_object *zend_error_exception_new(zend_class_entry *class_type) /* {{{ */
292+
{
293+
return zend_default_exception_new_ex(class_type, 0);
294+
}
295+
/* }}} */
296+
283297
/* {{{ Clone the exception object */
284298
ZEND_COLD ZEND_METHOD(Exception, __clone)
285299
{
@@ -725,11 +739,6 @@ ZEND_METHOD(Exception, __toString)
725739
}
726740
/* }}} */
727741

728-
static void zend_init_exception_class_entry(zend_class_entry *ce) {
729-
ce->create_object = zend_default_exception_new;
730-
ce->default_object_handlers = &default_exception_handlers;
731-
}
732-
733742
void zend_register_default_exception(void) /* {{{ */
734743
{
735744
zend_ce_throwable = register_class_Throwable(zend_ce_stringable);
@@ -739,37 +748,37 @@ void zend_register_default_exception(void) /* {{{ */
739748
default_exception_handlers.clone_obj = NULL;
740749

741750
zend_ce_exception = register_class_Exception(zend_ce_throwable);
742-
zend_init_exception_class_entry(zend_ce_exception);
751+
zend_ce_exception->create_object = zend_default_exception_new;
743752

744753
zend_ce_error_exception = register_class_ErrorException(zend_ce_exception);
745-
zend_init_exception_class_entry(zend_ce_error_exception);
754+
zend_ce_error_exception->create_object = zend_error_exception_new;
746755

747756
zend_ce_error = register_class_Error(zend_ce_throwable);
748-
zend_init_exception_class_entry(zend_ce_error);
757+
zend_ce_error->create_object = zend_default_exception_new;
749758

750759
zend_ce_compile_error = register_class_CompileError(zend_ce_error);
751-
zend_init_exception_class_entry(zend_ce_compile_error);
760+
zend_ce_compile_error->create_object = zend_default_exception_new;
752761

753762
zend_ce_parse_error = register_class_ParseError(zend_ce_compile_error);
754-
zend_init_exception_class_entry(zend_ce_parse_error);
763+
zend_ce_parse_error->create_object = zend_default_exception_new;
755764

756765
zend_ce_type_error = register_class_TypeError(zend_ce_error);
757-
zend_init_exception_class_entry(zend_ce_type_error);
766+
zend_ce_type_error->create_object = zend_default_exception_new;
758767

759768
zend_ce_argument_count_error = register_class_ArgumentCountError(zend_ce_type_error);
760-
zend_init_exception_class_entry(zend_ce_argument_count_error);
769+
zend_ce_argument_count_error->create_object = zend_default_exception_new;
761770

762771
zend_ce_value_error = register_class_ValueError(zend_ce_error);
763-
zend_init_exception_class_entry(zend_ce_value_error);
772+
zend_ce_value_error->create_object = zend_default_exception_new;
764773

765774
zend_ce_arithmetic_error = register_class_ArithmeticError(zend_ce_error);
766-
zend_init_exception_class_entry(zend_ce_arithmetic_error);
775+
zend_ce_arithmetic_error->create_object = zend_default_exception_new;
767776

768777
zend_ce_division_by_zero_error = register_class_DivisionByZeroError(zend_ce_arithmetic_error);
769-
zend_init_exception_class_entry(zend_ce_division_by_zero_error);
778+
zend_ce_division_by_zero_error->create_object = zend_default_exception_new;
770779

771780
zend_ce_unhandled_match_error = register_class_UnhandledMatchError(zend_ce_error);
772-
zend_init_exception_class_entry(zend_ce_unhandled_match_error);
781+
zend_ce_unhandled_match_error->create_object = zend_default_exception_new;
773782

774783
INIT_CLASS_ENTRY(zend_ce_unwind_exit, "UnwindExit", NULL);
775784

‎Zend/zend_fibers.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,9 +589,12 @@ static zend_always_inline zend_fiber_transfer zend_fiber_suspend(zend_fiber *fib
589589
static zend_object *zend_fiber_object_create(zend_class_entry *ce)
590590
{
591591
zend_fiber *fiber = emalloc(sizeof(zend_fiber));
592+
592593
memset(fiber, 0, sizeof(zend_fiber));
593594

594595
zend_object_std_init(&fiber->std, ce);
596+
fiber->std.handlers = &zend_fiber_handlers;
597+
595598
return &fiber->std;
596599
}
597600

@@ -900,7 +903,6 @@ void zend_register_fiber_ce(void)
900903
{
901904
zend_ce_fiber = register_class_Fiber();
902905
zend_ce_fiber->create_object = zend_fiber_object_create;
903-
zend_ce_fiber->default_object_handlers = &zend_fiber_handlers;
904906

905907
zend_fiber_handlers = std_object_handlers;
906908
zend_fiber_handlers.dtor_obj = zend_fiber_object_destroy;

‎Zend/zend_generators.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ static HashTable *zend_generator_get_gc(zend_object *object, zval **table, int *
404404

405405
static zend_object *zend_generator_create(zend_class_entry *class_type) /* {{{ */
406406
{
407-
zend_generator *generator = emalloc(sizeof(zend_generator));
407+
zend_generator *generator;
408+
409+
generator = emalloc(sizeof(zend_generator));
408410
memset(generator, 0, sizeof(zend_generator));
409411

410412
/* The key will be incremented on first use, so it'll start at 0 */
@@ -419,6 +421,8 @@ static zend_object *zend_generator_create(zend_class_entry *class_type) /* {{{ *
419421
generator->node.ptr.root = NULL;
420422

421423
zend_object_std_init(&generator->std, class_type);
424+
generator->std.handlers = &zend_generator_handlers;
425+
422426
return (zend_object*)generator;
423427
}
424428
/* }}} */
@@ -1128,7 +1132,6 @@ void zend_register_generator_ce(void) /* {{{ */
11281132
zend_ce_generator->create_object = zend_generator_create;
11291133
/* get_iterator has to be assigned *after* implementing the interface */
11301134
zend_ce_generator->get_iterator = zend_generator_get_iterator;
1131-
zend_ce_generator->default_object_handlers = &zend_generator_handlers;
11321135

11331136
memcpy(&zend_generator_handlers, &std_object_handlers, sizeof(zend_object_handlers));
11341137
zend_generator_handlers.free_obj = zend_generator_free_storage;

‎Zend/zend_interfaces.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ typedef struct {
480480
static zend_object *zend_internal_iterator_create(zend_class_entry *ce) {
481481
zend_internal_iterator *intern = emalloc(sizeof(zend_internal_iterator));
482482
zend_object_std_init(&intern->std, ce);
483+
intern->std.handlers = &zend_internal_iterator_handlers;
483484
intern->iter = NULL;
484485
intern->rewind_called = 0;
485486
return &intern->std;
@@ -654,7 +655,6 @@ ZEND_API void zend_register_interfaces(void)
654655

655656
zend_ce_internal_iterator = register_class_InternalIterator(zend_ce_iterator);
656657
zend_ce_internal_iterator->create_object = zend_internal_iterator_create;
657-
zend_ce_internal_iterator->default_object_handlers = &zend_internal_iterator_handlers;
658658

659659
memcpy(&zend_internal_iterator_handlers, zend_get_std_object_handlers(),
660660
sizeof(zend_object_handlers));

‎Zend/zend_objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ static zend_always_inline void _zend_object_std_init(zend_object *object, zend_c
3131
GC_SET_REFCOUNT(object, 1);
3232
GC_TYPE_INFO(object) = GC_OBJECT;
3333
object->ce = ce;
34-
object->handlers = ce->default_object_handlers;
3534
object->properties = NULL;
3635
zend_objects_store_put(object);
3736
if (UNEXPECTED(ce->ce_flags & ZEND_ACC_USE_GUARDS)) {
@@ -187,6 +186,7 @@ ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce)
187186
zend_object *object = emalloc(sizeof(zend_object) + zend_object_properties_size(ce));
188187

189188
_zend_object_std_init(object, ce);
189+
object->handlers = &std_object_handlers;
190190
return object;
191191
}
192192

‎Zend/zend_weakrefs.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ static zend_object* zend_weakref_new(zend_class_entry *ce) {
210210
zend_weakref *wr = zend_object_alloc(sizeof(zend_weakref), zend_ce_weakref);
211211

212212
zend_object_std_init(&wr->std, zend_ce_weakref);
213+
214+
wr->std.handlers = &zend_weakref_handlers;
215+
213216
return &wr->std;
214217
}
215218

@@ -301,6 +304,7 @@ static zend_object *zend_weakmap_create_object(zend_class_entry *ce)
301304
{
302305
zend_weakmap *wm = zend_object_alloc(sizeof(zend_weakmap), ce);
303306
zend_object_std_init(&wm->std, ce);
307+
wm->std.handlers = &zend_weakmap_handlers;
304308

305309
zend_hash_init(&wm->ht, 0, NULL, ZVAL_PTR_DTOR, 0);
306310
return &wm->std;
@@ -647,7 +651,6 @@ void zend_register_weakref_ce(void) /* {{{ */
647651
zend_ce_weakref = register_class_WeakReference();
648652

649653
zend_ce_weakref->create_object = zend_weakref_new;
650-
zend_ce_weakref->default_object_handlers = &zend_weakref_handlers;
651654

652655
memcpy(&zend_weakref_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
653656
zend_weakref_handlers.offset = XtOffsetOf(zend_weakref, std);
@@ -659,7 +662,6 @@ void zend_register_weakref_ce(void) /* {{{ */
659662

660663
zend_ce_weakmap->create_object = zend_weakmap_create_object;
661664
zend_ce_weakmap->get_iterator = zend_weakmap_get_iterator;
662-
zend_ce_weakmap->default_object_handlers = &zend_weakmap_handlers;
663665

664666
memcpy(&zend_weakmap_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
665667
zend_weakmap_handlers.offset = XtOffsetOf(zend_weakmap, std);

‎ext/dom/php_dom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,6 @@ PHP_MINIT_FUNCTION(dom)
782782

783783
dom_xpath_class_entry = register_class_DOMXPath();
784784
dom_xpath_class_entry->create_object = dom_xpath_objects_new;
785-
dom_xpath_class_entry->default_object_handlers = &dom_xpath_object_handlers;
786785

787786
zend_hash_init(&dom_xpath_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
788787
dom_register_prop_handler(&dom_xpath_prop_handlers, "document", sizeof("document")-1, dom_xpath_document_read, NULL);
@@ -990,6 +989,7 @@ zend_object *dom_xpath_objects_new(zend_class_entry *class_type)
990989
intern->register_node_ns = 1;
991990

992991
intern->dom.prop_handler = &dom_xpath_prop_handlers;
992+
intern->dom.std.handlers = &dom_xpath_object_handlers;
993993

994994
zend_object_std_init(&intern->dom.std, class_type);
995995
object_properties_init(&intern->dom.std, class_type);

0 commit comments

Comments
 (0)