Revert unnecessary changes

php · Feb 24, 2025 · 21ec227 · 21ec227
1 parent a48f879
commit 21ec227
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
@@ -463,10 +463,7 @@ typedef struct _zend_property_info {
 #define OBJ_PROP_TO_OFFSET(num) \
 	((uint32_t)(XtOffsetOf(zend_object, properties_table) + sizeof(zval) * (num)))
 #define OBJ_PROP_TO_NUM(offset) \
-	(((offset) - OBJ_PROP_TO_OFFSET(0)) / sizeof(zval))
-
-#define Z_PROP_TABLE_OFFSET(prop_info) \
-	OBJ_PROP_TO_NUM(!((prop_info)->prototype->flags & ZEND_ACC_VIRTUAL) ? (prop_info)->prototype->offset : (prop_info)->offset)
+	((offset - OBJ_PROP_TO_OFFSET(0)) / sizeof(zval))
 
 typedef struct _zend_class_constant {
 	zval value; /* flags are stored in u2 */

diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -1684,7 +1684,8 @@ void zend_build_properties_info_table(zend_class_entry *ce)
 	ZEND_HASH_MAP_FOREACH_PTR(&ce->properties_info, prop) {
 		if (prop->ce == ce && (prop->flags & ZEND_ACC_STATIC) == 0
 		 && !(prop->flags & ZEND_ACC_VIRTUAL)) {
-			table[Z_PROP_TABLE_OFFSET(prop)] = prop;
+			uint32_t prop_table_offset = OBJ_PROP_TO_NUM(!(prop->prototype->flags & ZEND_ACC_VIRTUAL) ? prop->prototype->offset : prop->offset);
+			table[prop_table_offset] = prop;
 		}
 	} ZEND_HASH_FOREACH_END();
 }

diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -14376,7 +14376,8 @@ static int zend_jit_fetch_obj(zend_jit_ctx         *jit,
 				if (ce && ce->ce_flags & ZEND_ACC_IMMUTABLE) {
 					ref = ir_CONST_ADDR(prop_info);
 				} else {
-					int prop_info_offset = Z_PROP_TABLE_OFFSET(prop_info) * sizeof(void*);
+					int prop_info_offset =
+						(((prop_info->offset - (sizeof(zend_object) - sizeof(zval))) / sizeof(zval)) * sizeof(void*));
 
 					ref = ir_LOAD_A(ir_ADD_OFFSET(obj_ref, offsetof(zend_object, ce)));
 					ref = ir_LOAD_A(ir_ADD_OFFSET(ref, offsetof(zend_class_entry, properties_info_table)));
@@ -14776,7 +14777,8 @@ static int zend_jit_assign_obj(zend_jit_ctx         *jit,
 			if (ce && ce->ce_flags & ZEND_ACC_IMMUTABLE) {
 				ref = ir_CONST_ADDR(prop_info);
 			} else {
-				int prop_info_offset = Z_PROP_TABLE_OFFSET(prop_info) * sizeof(void*);
+				int prop_info_offset =
+					(((prop_info->offset - (sizeof(zend_object) - sizeof(zval))) / sizeof(zval)) * sizeof(void*));
 
 				ref = ir_LOAD_A(ir_ADD_OFFSET(obj_ref, offsetof(zend_object, ce)));
 				ref = ir_LOAD_A(ir_ADD_OFFSET(ref, offsetof(zend_class_entry, properties_info_table)));
@@ -15131,7 +15133,8 @@ static int zend_jit_assign_obj_op(zend_jit_ctx         *jit,
 			if (ce && ce->ce_flags & ZEND_ACC_IMMUTABLE) {
 				ref = ir_CONST_ADDR(prop_info);
 			} else {
-				int prop_info_offset = Z_PROP_TABLE_OFFSET(prop_info) * sizeof(void*);
+				int prop_info_offset =
+					(((prop_info->offset - (sizeof(zend_object) - sizeof(zval))) / sizeof(zval)) * sizeof(void*));
 
 				ref = ir_LOAD_A(ir_ADD_OFFSET(obj_ref, offsetof(zend_object, ce)));
 				ref = ir_LOAD_A(ir_ADD_OFFSET(ref, offsetof(zend_class_entry, properties_info_table)));
@@ -15520,7 +15523,8 @@ static int zend_jit_incdec_obj(zend_jit_ctx         *jit,
 			if (ce && ce->ce_flags & ZEND_ACC_IMMUTABLE) {
 				ref = ir_CONST_ADDR(prop_info);
 			} else {
-				int prop_info_offset = Z_PROP_TABLE_OFFSET(prop_info) * sizeof(void*);
+				int prop_info_offset =
+					(((prop_info->offset - (sizeof(zend_object) - sizeof(zval))) / sizeof(zval)) * sizeof(void*));
 
 				ref = ir_LOAD_A(ir_ADD_OFFSET(obj_ref, offsetof(zend_object, ce)));
 				ref = ir_LOAD_A(ir_ADD_OFFSET(ref, offsetof(zend_class_entry, properties_info_table)));