Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix create_object checks

Author: iluuu1994

Zend/Optimizer/escape_analysis.c

@@ -164,10 +164,17 @@ static bool is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, i
 					/* These flags will always cause an exception */
 					ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS
 					| ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT;
-				if (ce && !ce->parent && !ce->create_object && !ce->constructor &&
-					!ce->destructor && !ce->__get && !ce->__set &&
-					!(ce->ce_flags & forbidden_flags) &&
-					(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
+				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
+				 && !ce->__get
+				 && !ce->__set
+				 && !(ce->ce_flags & forbidden_flags)
+				 && (ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
 					return 1;
 				}
 				break;
@@ -227,8 +234,15 @@ static bool is_local_def(zend_op_array *op_array, zend_ssa *ssa, int def, int va
 				/* objects with destructors should escape */
 				zend_class_entry *ce = zend_optimizer_get_class_entry_from_op1(
 					script, op_array, opline);
-				if (ce && !ce->create_object && !ce->constructor &&
-					!ce->destructor && !ce->__get && !ce->__set && !ce->parent) {
+				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
+				 && !ce->__get
+				 && !ce->__set
+				 && !ce->parent) {
 					return 1;
 				}
 				break;

Zend/Optimizer/zend_inference.c

@@ -3781,6 +3781,7 @@ static zend_always_inline zend_result _zend_update_type_info(
 						/* Unset properties will resort back to __get/__set */
 						if (ce
 						 && !ce->create_object
+						 && ce->default_object_handlers->read_property == zend_std_read_property
 						 && !ce->__get
 						 && !result_may_be_separated(ssa, ssa_op)) {
 							tmp &= ~MAY_BE_RC1;
@@ -5074,8 +5075,14 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 				const zend_ssa_var_info *var_info = ssa->var_info + ssa_op->op1_use;
 				const zend_class_entry *ce = var_info->ce;
 
-				if (var_info->is_instanceof ||
-				    !ce || ce->create_object || ce->__get || ce->__set || ce->parent) {
+				if (var_info->is_instanceof
+				 || !ce
+				 || ce->create_object
+				 || ce->default_object_handlers->write_property != zend_std_write_property
+				 || ce->default_object_handlers->get_property_ptr_ptr != zend_std_get_property_ptr_ptr
+				 || ce->__get
+				 || ce->__set
+				 || ce->parent) {
 					return 1;
 				}