Remove get_constructor object handler

Author: Girgias

NEWS

@@ -126,9 +126,8 @@ PHP                                                                        NEWS
 - PGSQL:
   . Enabled 64 bits support for pg_lo_truncate()/pg_lo_tell()
     if the server supports it. (KentarouTakeda)
-  . pg_fetch_object() now surfaces non-instantiable class errors
-    before fetching, resolves the constructor via the get_constructor
-    handler, and reports the empty-constructor ValueError on the
+  . pg_fetch_object() now surfaces non-instantiable class errorsv before
+    fetching, and reports the empty-constructor ValueError on the
     $constructor_args argument. (David Carlier)
 
 - Phar:

UPGRADING.INTERNALS

@@ -110,6 +110,10 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . Added ZEND_CONTAINER_OF().
   . The OPENBASEDIR_CHECKPATH() compatibility macro has been removed, instead
     use php_check_open_basedir() directly.
+  . The get_constructor object handler has been removed.
+    Instead to mark an internal class as not instantiable the new
+    #[\NonInstantiableClass("Reason")] attribute should be attached to the
+    class definition in the stubs.
 
 ========================
 2. Build system changes

Zend/Optimizer/escape_analysis.c

@@ -165,7 +165,6 @@ static bool is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, i
 				if (ce
 				 && !ce->parent
 				 && !ce->create_object
-				 && ce->default_object_handlers->get_constructor == zend_std_get_constructor
 				 && ce->default_object_handlers->dtor_obj == zend_objects_destroy_object
 				 && !ce->constructor
 				 && !ce->destructor
@@ -234,7 +233,6 @@ static bool is_local_def(zend_op_array *op_array, zend_ssa *ssa, int def, int va
 					script, op_array, opline);
 				if (ce
 				 && !ce->create_object
-				 && ce->default_object_handlers->get_constructor == zend_std_get_constructor
 				 && ce->default_object_handlers->dtor_obj == zend_objects_destroy_object
 				 && !ce->constructor
 				 && !ce->destructor

Zend/Optimizer/zend_inference.c

@@ -3394,8 +3394,7 @@ static zend_always_inline zend_result _zend_update_type_info(
 			/* New objects without constructors cannot escape. */
 			if (ce
 			 && !ce->constructor
-			 && !ce->create_object
-			 && ce->default_object_handlers->get_constructor == zend_std_get_constructor) {
+			 && !ce->create_object) {
 				tmp &= ~MAY_BE_RCN;
 			}
 			UPDATE_SSA_TYPE(tmp, ssa_op->result_def);

Zend/zend_iterators.c

@@ -42,7 +42,6 @@ static const zend_object_handlers iterator_object_handlers = {
 	NULL, /* unset dim */
 	NULL, /* props get */
 	NULL, /* method get */
-	NULL, /* get ctor */
 	NULL, /* get class name */
 	NULL, /* cast */
 	NULL, /* count */

Zend/zend_object_handlers.c

@@ -2173,12 +2173,6 @@ ZEND_API ZEND_COLD bool zend_std_unset_static_property(const zend_class_entry *c
 }
 /* }}} */
 
-ZEND_API zend_function *zend_std_get_constructor(zend_object *zobj) /* {{{ */
-{
-	return NULL;
-}
-/* }}} */
-
 ZEND_API int zend_std_compare_objects(zval *o1, zval *o2) /* {{{ */
 {
 	zend_object *zobj1, *zobj2;
@@ -2637,7 +2631,6 @@ ZEND_API const zend_object_handlers std_object_handlers = {
 	zend_std_unset_dimension,				/* unset_dimension */
 	zend_std_get_properties,				/* get_properties */
 	zend_std_get_method,					/* get_method */
-	zend_std_get_constructor,				/* get_constructor */
 	zend_std_get_class_name,				/* get_class_name */
 	zend_std_cast_object_tostring,			/* cast_object */
 	NULL,									/* count_elements */

Zend/zend_object_handlers.h

@@ -153,7 +153,6 @@ typedef zend_array *(*zend_object_get_properties_for_t)(zend_object *object, zen
 /* Andi - EX(fbc) (function being called) needs to be initialized already in the INIT fcall opcode so that the parameters can be parsed the right way. We need to add another callback for this.
  */
 typedef zend_function *(*zend_object_get_method_t)(zend_object **object, zend_string *method, const zval *key);
-typedef zend_function *(*zend_object_get_constructor_t)(zend_object *object);
 
 /* free_obj should release any resources the object holds, without freeing the
  * object structure itself. The object does not need to be in a valid state after
@@ -221,7 +220,6 @@ struct _zend_object_handlers {
 	zend_object_unset_dimension_t			unset_dimension;      /* required */
 	zend_object_get_properties_t			get_properties;       /* required */
 	zend_object_get_method_t				get_method;           /* required */
-	zend_object_get_constructor_t			get_constructor;      /* required */
 	zend_object_get_class_name_t			get_class_name;       /* required */
 	zend_object_cast_t						cast_object;          /* required */
 	zend_object_count_elements_t			count_elements;       /* optional */
@@ -251,7 +249,6 @@ ZEND_API zend_function *zend_std_get_static_method(const zend_class_entry *ce, z
 ZEND_API zval *zend_std_get_static_property_with_info(zend_class_entry *ce, zend_string *property_name, int type, struct _zend_property_info **prop_info);
 ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *property_name, int type);
 ZEND_API ZEND_COLD bool zend_std_unset_static_property(const zend_class_entry *ce, const zend_string *property_name);
-ZEND_API zend_function *zend_std_get_constructor(zend_object *object);
 ZEND_API struct _zend_property_info *zend_get_property_info(const zend_class_entry *ce, zend_string *member, int silent);
 ZEND_API HashTable *zend_std_get_properties(zend_object *object);
 ZEND_API HashTable *zend_get_properties_no_lazy_init(zend_object *zobj);

ext/com_dotnet/com_handlers.c

@@ -524,7 +524,6 @@ zend_object_handlers php_com_object_handlers = {
 	com_dimension_delete,
 	com_properties_get,
 	com_method_get,
-	zend_std_get_constructor,
 	com_class_name_get,
 	com_object_cast,
 	com_object_count,