Convert object_init_ex to instantiable_class version

As those class_entries are known to be instantiable

Author: Girgias

Zend/zend_closures.c

@@ -762,7 +762,7 @@ static void zend_create_closure_ex(zval *res, zend_function *func, zend_class_en
 	zend_closure *closure;
 	void *ptr;
 
-	object_init_ex(res, zend_ce_closure);
+	object_init_instantiable_class(res, zend_ce_closure);
 
 	closure = (zend_closure *)Z_OBJ_P(res);
 

Zend/zend_gc.c

@@ -1915,7 +1915,7 @@ static zend_fiber *gc_create_destructor_fiber(void)
 
 	GC_TRACE("starting destructor fiber");
 
-	if (UNEXPECTED(object_init_ex(&zobj, zend_ce_fiber) == FAILURE)) {
+	if (UNEXPECTED(object_init_instantiable_class(&zobj, zend_ce_fiber) == FAILURE)) {
 		gc_create_destructor_fiber_error();
 	}
 

Zend/zend_vm_def.h

@@ -4697,7 +4697,7 @@ ZEND_VM_HANDLER(139, ZEND_GENERATOR_CREATE, ANY, ANY)
 		uint32_t num_args, used_stack, call_info;
 
 		SAVE_OPLINE();
-		object_init_ex(return_value, zend_ce_generator);
+		object_init_instantiable_class(return_value, zend_ce_generator);
 
 		/*
 		 * Normally the execute_data is allocated on the VM stack (because it does

Zend/zend_weakrefs.c

@@ -263,7 +263,7 @@ static zend_always_inline bool zend_weakref_find(zend_object *referent, zval *re
 static zend_always_inline void zend_weakref_create(zend_object *referent, zval *return_value) {
 	zend_weakref *wr;
 
-	object_init_ex(return_value, zend_ce_weakref);
+	object_init_instantiable_class(return_value, zend_ce_weakref);
 
 	wr = zend_weakref_fetch(return_value);
 	wr->referent = referent;

ext/curl/curl_file.c

@@ -58,7 +58,7 @@ ZEND_METHOD(CURLFile, __construct)
 /* {{{ Create the CURLFile object */
 PHP_FUNCTION(curl_file_create)
 {
-	object_init_ex( return_value, curl_CURLFile_class );
+	object_init_instantiable_class( return_value, curl_CURLFile_class );
 	curlfile_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */

ext/curl/interface.c

@@ -1024,7 +1024,7 @@ php_curl *init_curl_handle_into_zval(zval *curl)
 {
 	php_curl *ch;
 
-	object_init_ex(curl, curl_ce);
+	object_init_instantiable_class(curl, curl_ce);
 	ch = Z_CURL_P(curl);
 
 	init_curl_handle(ch);

ext/curl/multi.c

@@ -64,7 +64,7 @@ PHP_FUNCTION(curl_multi_init)
 		zend_throw_error(NULL, "%s(): Could not initialize a new cURL multi handle", get_active_function_name());
 		RETURN_THROWS();
 	}
-	object_init_ex(return_value, curl_multi_ce);
+	object_init_instantiable_class(return_value, curl_multi_ce);
 	mh = Z_CURL_MULTI_P(return_value);
 	mh->multi = multi;
 

ext/curl/share.c

@@ -34,7 +34,7 @@ PHP_FUNCTION(curl_share_init)
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	object_init_ex(return_value, curl_share_ce);
+	object_init_instantiable_class(return_value, curl_share_ce);
 	sh = Z_CURL_SHARE_P(return_value);
 
 	sh->share = curl_share_init();
@@ -194,7 +194,7 @@ PHP_FUNCTION(curl_share_init_persistent)
 	} ZEND_HASH_FOREACH_END();
 
 	// We're now decently confident that we'll be returning a CurlSharePersistentHandle object, so we construct it here.
-	object_init_ex(return_value, curl_share_persistent_ce);
+	object_init_instantiable_class(return_value, curl_share_persistent_ce);
 
 	// Next we initialize a property field for the CurlSharePersistentHandle object with the enabled share options.
 	array_init(&share_opts_prop);

ext/date/php_date.c

@@ -1487,7 +1487,7 @@ static void create_date_period_datetime(timelib_time *datetime, zend_class_entry
 	if (datetime) {
 		php_date_obj *date_obj;
 
-		zend_result result = object_init_ex(zv, ce);
+		zend_result result = object_init_instantiable_class(zv, ce);
 		ZEND_ASSERT(result == SUCCESS && "should succeed as it reuses an existing object's ce");
 		date_obj = Z_PHPDATE_P(zv);
 		date_obj->time = timelib_time_clone(datetime);
@@ -1501,7 +1501,7 @@ static void create_date_period_interval(timelib_rel_time *interval, zval *zv)
 	if (interval) {
 		php_interval_obj *interval_obj;
 
-		object_init_ex(zv, date_ce_interval);
+		object_init_instantiable_class(zv, date_ce_interval);
 		interval_obj = Z_PHPINTERVAL_P(zv);
 		interval_obj->diff = timelib_rel_time_clone(interval);
 		interval_obj->initialized = true;
@@ -5838,7 +5838,7 @@ PHP_METHOD(DatePeriod, __set_state)
 		Z_PARAM_ARRAY_HT(myht)
 	ZEND_PARSE_PARAMETERS_END();
 
-	object_init_ex(return_value, date_ce_period);
+	object_init_instantiable_class(return_value, date_ce_period);
 	period_obj = Z_PHPPERIOD_P(return_value);
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");

ext/dba/dba.c

@@ -589,7 +589,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
 				RETURN_FALSE;
 			}
 
-			object_init_ex(return_value, dba_connection_ce);
+			object_init_instantiable_class(return_value, dba_connection_ce);
 			dba_connection *connection = Z_DBA_CONNECTION_P(return_value);
 			connection->info = (dba_info *)le->ptr;
 			connection->hash = zend_string_dup(resource_key, /* persistent */ true);
@@ -783,7 +783,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, bool persistent)
 	zval *connection_zval;
 	dba_connection *connection;
 	if ((connection_zval = zend_hash_find(&DBA_G(connections), resource_key)) == NULL) {
-		object_init_ex(return_value, dba_connection_ce);
+		object_init_instantiable_class(return_value, dba_connection_ce);
 		connection = Z_DBA_CONNECTION_P(return_value);
 
 		connection->info = pecalloc(1, sizeof(dba_info), persistent);