dedup

Author: nicolas-grekas

Zend/zend_vm_def.h

@@ -2984,6 +2984,26 @@ ZEND_VM_HANDLER(33, ZEND_ASSIGN_STATIC_PROP_REF, ANY, ANY, CACHE_SLOT|SRC)
 	ZEND_VM_NEXT_OPCODE_EX(1, 2);
 }
 
+/* Clear IS_PROP_REINITABLE from all promoted readonly properties of the exiting
+ * constructor's scope. Called for both 'new Foo()' and 'parent::__construct()'.
+ * Guarded against redefinition because the generator emits this into each VM-kind section. */
+#ifndef ZEND_CTOR_CLEAR_PROMOTED_READONLY_REINITABLE_DEFINED
+#define ZEND_CTOR_CLEAR_PROMOTED_READONLY_REINITABLE_DEFINED
+static zend_always_inline void zend_ctor_clear_promoted_readonly_reinitable(zend_execute_data *ex, uint32_t call_info)
+{
+	if ((call_info & ZEND_CALL_HAS_THIS) && (ex->func->common.fn_flags & ZEND_ACC_CTOR)) {
+		zend_object *obj = Z_OBJ(ex->This);
+		zend_property_info *ctor_prop_info;
+		ZEND_HASH_MAP_FOREACH_PTR(&ex->func->common.scope->properties_info, ctor_prop_info) {
+			if ((ctor_prop_info->flags & (ZEND_ACC_READONLY | ZEND_ACC_PROMOTED)) == (ZEND_ACC_READONLY | ZEND_ACC_PROMOTED)
+			 && IS_VALID_PROPERTY_OFFSET(ctor_prop_info->offset)) {
+				Z_PROP_FLAG_P(OBJ_PROP(obj, ctor_prop_info->offset)) &= ~IS_PROP_REINITABLE;
+			}
+		} ZEND_HASH_FOREACH_END();
+	}
+}
+#endif
+
 ZEND_VM_HOT_HELPER(zend_leave_helper, ANY, ANY)
 {
 	zend_execute_data *old_execute_data;
@@ -3000,19 +3020,7 @@ ZEND_VM_HOT_HELPER(zend_leave_helper, ANY, ANY)
 #ifdef ZEND_PREFER_RELOAD
 		call_info = EX_CALL_INFO();
 #endif
-		/* When a constructor exits, clear IS_PROP_REINITABLE from all promoted readonly
-		 * properties of the declaring class. Runs for both 'new Foo()' (RELEASE_THIS set)
-		 * and 'parent::__construct()' (only HAS_THIS set, no RELEASE_THIS). */
-		if ((call_info & ZEND_CALL_HAS_THIS) && (EX(func)->common.fn_flags & ZEND_ACC_CTOR)) {
-			zend_object *obj = Z_OBJ(execute_data->This);
-			zend_property_info *ctor_prop_info;
-			ZEND_HASH_MAP_FOREACH_PTR(&EX(func)->common.scope->properties_info, ctor_prop_info) {
-				if ((ctor_prop_info->flags & (ZEND_ACC_READONLY | ZEND_ACC_PROMOTED)) == (ZEND_ACC_READONLY | ZEND_ACC_PROMOTED)
-				 && IS_VALID_PROPERTY_OFFSET(ctor_prop_info->offset)) {
-					Z_PROP_FLAG_P(OBJ_PROP(obj, ctor_prop_info->offset)) &= ~IS_PROP_REINITABLE;
-				}
-			} ZEND_HASH_FOREACH_END();
-		}
+		zend_ctor_clear_promoted_readonly_reinitable(execute_data, call_info);
 		if (UNEXPECTED(call_info & ZEND_CALL_RELEASE_THIS)) {
 			OBJ_RELEASE(Z_OBJ(execute_data->This));
 		} else if (UNEXPECTED(call_info & ZEND_CALL_CLOSURE)) {
@@ -3047,19 +3055,7 @@ ZEND_VM_HOT_HELPER(zend_leave_helper, ANY, ANY)
 		 * as that may free the op_array. */
 		zend_vm_stack_free_extra_args_ex(call_info, execute_data);
 
-		/* When a constructor exits, clear IS_PROP_REINITABLE from all promoted readonly
-		 * properties of the declaring class. Runs for both 'new Foo()' (RELEASE_THIS set)
-		 * and 'parent::__construct()' (only HAS_THIS set, no RELEASE_THIS). */
-		if ((call_info & ZEND_CALL_HAS_THIS) && (EX(func)->common.fn_flags & ZEND_ACC_CTOR)) {
-			zend_object *obj = Z_OBJ(execute_data->This);
-			zend_property_info *ctor_prop_info;
-			ZEND_HASH_MAP_FOREACH_PTR(&EX(func)->common.scope->properties_info, ctor_prop_info) {
-				if ((ctor_prop_info->flags & (ZEND_ACC_READONLY | ZEND_ACC_PROMOTED)) == (ZEND_ACC_READONLY | ZEND_ACC_PROMOTED)
-				 && IS_VALID_PROPERTY_OFFSET(ctor_prop_info->offset)) {
-					Z_PROP_FLAG_P(OBJ_PROP(obj, ctor_prop_info->offset)) &= ~IS_PROP_REINITABLE;
-				}
-			} ZEND_HASH_FOREACH_END();
-		}
+		zend_ctor_clear_promoted_readonly_reinitable(execute_data, call_info);
 		if (UNEXPECTED(call_info & ZEND_CALL_RELEASE_THIS)) {
 			OBJ_RELEASE(Z_OBJ(execute_data->This));
 		} else if (UNEXPECTED(call_info & ZEND_CALL_CLOSURE)) {