Use zval's extra as a bitfield

nicolas-grekas · nicolas-grekas · commit a5706e29ee42 · 2022-08-23T12:44:00.000+02:00
diff --git a/Zend/Optimizer/compact_literals.c b/Zend/Optimizer/compact_literals.c
@@ -253,7 +253,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
 						LITERAL_INFO(opline->op1.constant, 1);
 					}
 					if (opline->op2_type == IS_CONST) {
-						if (Z_EXTRA(op_array->literals[opline->op2.constant]) == ZEND_EXTRA_VALUE) {
+						if (Z_EXTRA(op_array->literals[opline->op2.constant]) & ZEND_EXTRA_VALUE) {
 							LITERAL_INFO(opline->op2.constant, 2);
 						} else {
 							LITERAL_INFO(opline->op2.constant, 1);
diff --git a/Zend/Optimizer/zend_optimizer.c b/Zend/Optimizer/zend_optimizer.c
@@ -579,7 +579,7 @@ bool zend_optimizer_update_op2_const(zend_op_array *op_array,
 					opline->op2.constant = zend_optimizer_add_literal(op_array, &tmp);
 					zend_string_hash_val(Z_STR_P(val));
 					zend_optimizer_add_literal(op_array, val);
-					Z_EXTRA(op_array->literals[opline->op2.constant]) = ZEND_EXTRA_VALUE;
+					Z_EXTRA(op_array->literals[opline->op2.constant]) |= ZEND_EXTRA_VALUE;
 					break;
 				}
 			}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -2553,7 +2553,7 @@ static inline void zend_handle_numeric_dim(zend_op *opline, znode *dim_node) /*
 			int c = zend_add_literal(&dim_node->u.constant);
 			ZEND_ASSERT(opline->op2.constant + 1 == c);
 			ZVAL_LONG(CT_CONSTANT(opline->op2), index);
-			Z_EXTRA_P(CT_CONSTANT(opline->op2)) = ZEND_EXTRA_VALUE;
+			Z_EXTRA_P(CT_CONSTANT(opline->op2)) |= ZEND_EXTRA_VALUE;
 			return;
 		}
 	}
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -2530,7 +2530,7 @@ static zend_always_inline void zend_fetch_dimension_address(zval *result, zval *
 		GC_ADDREF(obj);
 		if (ZEND_CONST_COND(dim_type == IS_CV, dim != NULL) && UNEXPECTED(Z_TYPE_P(dim) == IS_UNDEF)) {
 			dim = ZVAL_UNDEFINED_OP2();
-		} else if (dim_type == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {
+		} else if (dim_type == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {
 			dim++;
 		}
 		retval = obj->handlers->read_dimension(obj, dim, type, result);
@@ -2736,7 +2736,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
 		if (ZEND_CONST_COND(dim_type == IS_CV, 1) && UNEXPECTED(Z_TYPE_P(dim) == IS_UNDEF)) {
 			dim = ZVAL_UNDEFINED_OP2();
 		}
-		if (dim_type == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {
+		if (dim_type == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {
 			dim++;
 		}
 		retval = obj->handlers->read_dimension(obj, dim, type, result);
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -634,7 +634,7 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
 				}
 			}
 		}
-		if (UNEXPECTED(Z_PROP_FLAG_P(retval) == IS_PROP_UNINIT)) {
+		if (UNEXPECTED(Z_PROP_FLAG_P(retval) & IS_PROP_UNINIT)) {
 			/* Skip __get() for uninitialized typed properties */
 			goto uninit_error;
 		}
@@ -811,7 +811,7 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 			Z_TRY_ADDREF_P(value);
 
 			if (UNEXPECTED(prop_info)) {
-				if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY) && Z_PROP_FLAG_P(variable_ptr) != IS_PROP_UNINIT)) {
+				if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY) && !(Z_PROP_FLAG_P(variable_ptr) & IS_PROP_UNINIT))) {
 					Z_TRY_DELREF_P(value);
 					zend_readonly_property_modification_error(prop_info);
 					variable_ptr = &EG(error_zval);
@@ -832,7 +832,7 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 				variable_ptr, value, IS_TMP_VAR, property_uses_strict_types());
 			goto exit;
 		}
-		if (Z_PROP_FLAG_P(variable_ptr) == IS_PROP_UNINIT) {
+		if (Z_PROP_FLAG_P(variable_ptr) & IS_PROP_UNINIT) {
 			/* Writes to uninitialized typed properties bypass __set(). */
 			goto write_std_property;
 		}
@@ -895,7 +895,7 @@ ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zva
 					goto exit;
 				}
 				value = &tmp;
-				Z_PROP_FLAG_P(variable_ptr) = 0;
+				Z_PROP_FLAG_P(variable_ptr) &= ~IS_PROP_UNINIT;
 				goto found; /* might have been updated via e.g. __toString() */
 			}
 
@@ -1050,7 +1050,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam
 		if (UNEXPECTED(Z_TYPE_P(retval) == IS_UNDEF)) {
 			if (EXPECTED(!zobj->ce->__get) ||
 			    UNEXPECTED((*zend_get_property_guard(zobj, name)) & IN_GET) ||
-			    UNEXPECTED(prop_info && Z_PROP_FLAG_P(retval) == IS_PROP_UNINIT)) {
+			    UNEXPECTED(prop_info && (Z_PROP_FLAG_P(retval) & IS_PROP_UNINIT))) {
 				if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
 					if (UNEXPECTED(prop_info)) {
 						zend_throw_error(NULL,
@@ -1126,7 +1126,7 @@ ZEND_API void zend_std_unset_property(zend_object *zobj, zend_string *name, void
 		zval *slot = OBJ_PROP(zobj, property_offset);
 
 		if (Z_TYPE_P(slot) != IS_UNDEF) {
-			if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY) && Z_PROP_FLAG_P(slot) != IS_PROP_UNINIT)) {
+			if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY) && !(Z_PROP_FLAG_P(slot) & IS_PROP_UNINIT))) {
 				zend_readonly_property_unset_error(prop_info->ce, name);
 				return;
 			}
@@ -1145,14 +1145,14 @@ ZEND_API void zend_std_unset_property(zend_object *zobj, zend_string *name, void
 			}
 			return;
 		}
-		if (UNEXPECTED(Z_PROP_FLAG_P(slot) == IS_PROP_UNINIT)) {
+		if (UNEXPECTED(Z_PROP_FLAG_P(slot) & IS_PROP_UNINIT)) {
 			if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY)
 					&& !verify_readonly_initialization_access(prop_info, zobj->ce, name, "unset"))) {
 				return;
 			}
 
 			/* Reset the IS_PROP_UNINIT flag, if it exists and bypass __unset(). */
-			Z_PROP_FLAG_P(slot) = 0;
+			Z_PROP_FLAG_P(slot) &= ~IS_PROP_UNINIT;
 			return;
 		}
 	} else if (EXPECTED(IS_DYNAMIC_PROPERTY_OFFSET(property_offset))
@@ -1760,7 +1760,7 @@ ZEND_API int zend_std_has_property(zend_object *zobj, zend_string *name, int has
 		if (Z_TYPE_P(value) != IS_UNDEF) {
 			goto found;
 		}
-		if (UNEXPECTED(Z_PROP_FLAG_P(value) == IS_PROP_UNINIT)) {
+		if (UNEXPECTED(Z_PROP_FLAG_P(value) & IS_PROP_UNINIT)) {
 			/* Skip __isset() for uninitialized typed properties */
 			result = 0;
 			goto exit;
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
@@ -214,7 +214,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object,
 				prop_info = zend_get_property_info_for_slot(new_object, dst);
 				if (UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {
 					slot = OBJ_PROP(new_object, prop_info->offset);
-					Z_PROP_FLAG_P(slot) = IS_PROP_UNINIT;
+					Z_PROP_FLAG_P(slot) |= IS_PROP_UNINIT;
 				}
 			}
 			src++;
@@ -272,8 +272,8 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object,
 				prop_info = zend_get_property_info_for_slot(new_object, dst);
 				if (UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {
 					slot = OBJ_PROP(new_object, prop_info->offset);
-					if (Z_TYPE_P(slot) != IS_UNDEF && Z_PROP_FLAG_P(slot) == IS_PROP_UNINIT) {
-						Z_PROP_FLAG_P(slot) = 0;
+					if (Z_TYPE_P(slot) != IS_UNDEF && (Z_PROP_FLAG_P(slot) & IS_PROP_UNINIT)) {
+						Z_PROP_FLAG_P(slot) &= ~IS_PROP_UNINIT;
 					}
 				}
 				dst++;
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
@@ -1437,7 +1437,7 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) {
  * (both use IS_UNDEF type) in the Z_EXTRA space. As such we also need to copy
  * the Z_EXTRA space when copying property default values etc. We define separate
  * macros for this purpose, so this workaround is easier to remove in the future. */
-#define IS_PROP_UNINIT 1
+#define IS_PROP_UNINIT 2
 #define Z_PROP_FLAG_P(z) Z_EXTRA_P(z)
 #define ZVAL_COPY_VALUE_PROP(z, v) \
 	do { *(z) = *(v); } while (0)
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -1208,7 +1208,7 @@ ZEND_VM_C_LABEL(assign_dim_op_new_array):
 			zend_object *obj = Z_OBJ_P(container);
 
 			dim = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);
-			if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {
+			if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {
 				dim++;
 			}
 			zend_binary_assign_op_obj_dim(obj, dim OPLINE_CC EXECUTE_DATA_CC);
@@ -1911,7 +1911,7 @@ ZEND_VM_C_LABEL(fetch_dim_r_array):
 			}
 		} else {
 ZEND_VM_C_LABEL(fetch_dim_r_slow):
-			if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {
+			if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {
 				dim++;
 			}
 			zend_fetch_dimension_address_read_R_slow(container, dim OPLINE_CC EXECUTE_DATA_CC);
@@ -2614,7 +2614,7 @@ ZEND_VM_C_LABEL(try_assign_dim_array):
 			dim = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);
 			if (OP2_TYPE == IS_CV && UNEXPECTED(Z_ISUNDEF_P(dim))) {
 				dim = ZVAL_UNDEFINED_OP2();
-			} else if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {
+			} else if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {
 				dim++;
 			}
 
@@ -6537,7 +6537,7 @@ ZEND_VM_C_LABEL(num_index_dim):
 			offset = ZVAL_UNDEFINED_OP2();
 		}
 		if (EXPECTED(Z_TYPE_P(container) == IS_OBJECT)) {
-			if (OP2_TYPE == IS_CONST && Z_EXTRA_P(offset) == ZEND_EXTRA_VALUE) {
+			if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(offset) & ZEND_EXTRA_VALUE)) {
 				offset++;
 			}
 			Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);
@@ -7312,7 +7312,7 @@ ZEND_VM_C_LABEL(num_index_prop):
 		}
 	}
 
-	if (OP2_TYPE == IS_CONST && Z_EXTRA_P(offset) == ZEND_EXTRA_VALUE) {
+	if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(offset) & ZEND_EXTRA_VALUE)) {
 		offset++;
 	}
 	if (!(opline->extended_value & ZEND_ISEMPTY)) {
@@ -9775,7 +9775,7 @@ ZEND_VM_C_LABEL(fetch_dim_r_index_array):
 	} else {
 ZEND_VM_C_LABEL(fetch_dim_r_index_slow):
 		SAVE_OPLINE();
-		if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {
+		if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {
 			dim++;
 		}
 		zend_fetch_dimension_address_read_R_slow(container, dim OPLINE_CC EXECUTE_DATA_CC);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx`
`253`	`253`	`LITERAL_INFO(opline->op1.constant, 1);`
`254`	`254`	`}`
`255`	`255`	`if (opline->op2_type == IS_CONST) {`
`256`		`- if (Z_EXTRA(op_array->literals[opline->op2.constant]) == ZEND_EXTRA_VALUE) {`
	`256`	`+ if (Z_EXTRA(op_array->literals[opline->op2.constant]) & ZEND_EXTRA_VALUE) {`
`257`	`257`	`LITERAL_INFO(opline->op2.constant, 2);`
`258`	`258`	`} else {`
`259`	`259`	`LITERAL_INFO(opline->op2.constant, 1);`
Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ bool zend_optimizer_update_op2_const(zend_op_array *op_array,`
`579`	`579`	`opline->op2.constant = zend_optimizer_add_literal(op_array, &tmp);`
`580`	`580`	`zend_string_hash_val(Z_STR_P(val));`
`581`	`581`	`zend_optimizer_add_literal(op_array, val);`
`582`		`- Z_EXTRA(op_array->literals[opline->op2.constant]) = ZEND_EXTRA_VALUE;`
	`582`	`+ Z_EXTRA(op_array->literals[opline->op2.constant]) \|= ZEND_EXTRA_VALUE;`
`583`	`583`	`break;`
`584`	`584`	`}`
`585`	`585`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2553,7 +2553,7 @@ static inline void zend_handle_numeric_dim(zend_op opline, znode dim_node) /*`
`2553`	`2553`	`int c = zend_add_literal(&dim_node->u.constant);`
`2554`	`2554`	`ZEND_ASSERT(opline->op2.constant + 1 == c);`
`2555`	`2555`	`ZVAL_LONG(CT_CONSTANT(opline->op2), index);`
`2556`		`- Z_EXTRA_P(CT_CONSTANT(opline->op2)) = ZEND_EXTRA_VALUE;`
	`2556`	`+ Z_EXTRA_P(CT_CONSTANT(opline->op2)) \|= ZEND_EXTRA_VALUE;`
`2557`	`2557`	`return;`
`2558`	`2558`	`}`
`2559`	`2559`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2530,7 +2530,7 @@ static zend_always_inline void zend_fetch_dimension_address(zval result, zval `
`2530`	`2530`	`GC_ADDREF(obj);`
`2531`	`2531`	`if (ZEND_CONST_COND(dim_type == IS_CV, dim != NULL) && UNEXPECTED(Z_TYPE_P(dim) == IS_UNDEF)) {`
`2532`	`2532`	`dim = ZVAL_UNDEFINED_OP2();`
`2533`		`- } else if (dim_type == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {`
	`2533`	`+ } else if (dim_type == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {`
`2534`	`2534`	`dim++;`
`2535`	`2535`	`}`
`2536`	`2536`	`retval = obj->handlers->read_dimension(obj, dim, type, result);`
`@@ -2736,7 +2736,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z`
`2736`	`2736`	`if (ZEND_CONST_COND(dim_type == IS_CV, 1) && UNEXPECTED(Z_TYPE_P(dim) == IS_UNDEF)) {`
`2737`	`2737`	`dim = ZVAL_UNDEFINED_OP2();`
`2738`	`2738`	`}`
`2739`		`- if (dim_type == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {`
	`2739`	`+ if (dim_type == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {`
`2740`	`2740`	`dim++;`
`2741`	`2741`	`}`
`2742`	`2742`	`retval = obj->handlers->read_dimension(obj, dim, type, result);`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ ZEND_API zval zend_std_read_property(zend_object zobj, zend_string *name, int`
`634`	`634`	`}`
`635`	`635`	`}`
`636`	`636`	`}`
`637`		`- if (UNEXPECTED(Z_PROP_FLAG_P(retval) == IS_PROP_UNINIT)) {`
	`637`	`+ if (UNEXPECTED(Z_PROP_FLAG_P(retval) & IS_PROP_UNINIT)) {`
`638`	`638`	`/* Skip __get() for uninitialized typed properties */`
`639`	`639`	`goto uninit_error;`
`640`	`640`	`}`
`@@ -811,7 +811,7 @@ ZEND_API zval zend_std_write_property(zend_object zobj, zend_string *name, zva`
`811`	`811`	`Z_TRY_ADDREF_P(value);`
`812`	`812`
`813`	`813`	`if (UNEXPECTED(prop_info)) {`
`814`		`- if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY) && Z_PROP_FLAG_P(variable_ptr) != IS_PROP_UNINIT)) {`
	`814`	`+ if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY) && !(Z_PROP_FLAG_P(variable_ptr) & IS_PROP_UNINIT))) {`
`815`	`815`	`Z_TRY_DELREF_P(value);`
`816`	`816`	`zend_readonly_property_modification_error(prop_info);`
`817`	`817`	`variable_ptr = &EG(error_zval);`
`@@ -832,7 +832,7 @@ ZEND_API zval zend_std_write_property(zend_object zobj, zend_string *name, zva`
`832`	`832`	`variable_ptr, value, IS_TMP_VAR, property_uses_strict_types());`
`833`	`833`	`goto exit;`
`834`	`834`	`}`
`835`		`- if (Z_PROP_FLAG_P(variable_ptr) == IS_PROP_UNINIT) {`
	`835`	`+ if (Z_PROP_FLAG_P(variable_ptr) & IS_PROP_UNINIT) {`
`836`	`836`	`/* Writes to uninitialized typed properties bypass __set(). */`
`837`	`837`	`goto write_std_property;`
`838`	`838`	`}`
`@@ -895,7 +895,7 @@ ZEND_API zval zend_std_write_property(zend_object zobj, zend_string *name, zva`
`895`	`895`	`goto exit;`
`896`	`896`	`}`
`897`	`897`	`value = &tmp;`
`898`		`- Z_PROP_FLAG_P(variable_ptr) = 0;`
	`898`	`+ Z_PROP_FLAG_P(variable_ptr) &= ~IS_PROP_UNINIT;`
`899`	`899`	`goto found; /* might have been updated via e.g. __toString() */`
`900`	`900`	`}`
`901`	`901`
`@@ -1050,7 +1050,7 @@ ZEND_API zval zend_std_get_property_ptr_ptr(zend_object zobj, zend_string *nam`
`1050`	`1050`	`if (UNEXPECTED(Z_TYPE_P(retval) == IS_UNDEF)) {`
`1051`	`1051`	`if (EXPECTED(!zobj->ce->__get) \|\|`
`1052`	`1052`	`UNEXPECTED((*zend_get_property_guard(zobj, name)) & IN_GET) \|\|`
`1053`		`- UNEXPECTED(prop_info && Z_PROP_FLAG_P(retval) == IS_PROP_UNINIT)) {`
	`1053`	`+ UNEXPECTED(prop_info && (Z_PROP_FLAG_P(retval) & IS_PROP_UNINIT))) {`
`1054`	`1054`	`if (UNEXPECTED(type == BP_VAR_RW \|\| type == BP_VAR_R)) {`
`1055`	`1055`	`if (UNEXPECTED(prop_info)) {`
`1056`	`1056`	`zend_throw_error(NULL,`
`@@ -1126,7 +1126,7 @@ ZEND_API void zend_std_unset_property(zend_object zobj, zend_string name, void`
`1126`	`1126`	`zval *slot = OBJ_PROP(zobj, property_offset);`
`1127`	`1127`
`1128`	`1128`	`if (Z_TYPE_P(slot) != IS_UNDEF) {`
`1129`		`- if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY) && Z_PROP_FLAG_P(slot) != IS_PROP_UNINIT)) {`
	`1129`	`+ if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY) && !(Z_PROP_FLAG_P(slot) & IS_PROP_UNINIT))) {`
`1130`	`1130`	`zend_readonly_property_unset_error(prop_info->ce, name);`
`1131`	`1131`	`return;`
`1132`	`1132`	`}`
`@@ -1145,14 +1145,14 @@ ZEND_API void zend_std_unset_property(zend_object zobj, zend_string name, void`
`1145`	`1145`	`}`
`1146`	`1146`	`return;`
`1147`	`1147`	`}`
`1148`		`- if (UNEXPECTED(Z_PROP_FLAG_P(slot) == IS_PROP_UNINIT)) {`
	`1148`	`+ if (UNEXPECTED(Z_PROP_FLAG_P(slot) & IS_PROP_UNINIT)) {`
`1149`	`1149`	`if (UNEXPECTED(prop_info && (prop_info->flags & ZEND_ACC_READONLY)`
`1150`	`1150`	`&& !verify_readonly_initialization_access(prop_info, zobj->ce, name, "unset"))) {`
`1151`	`1151`	`return;`
`1152`	`1152`	`}`
`1153`	`1153`
`1154`	`1154`	`/* Reset the IS_PROP_UNINIT flag, if it exists and bypass __unset(). */`
`1155`		`- Z_PROP_FLAG_P(slot) = 0;`
	`1155`	`+ Z_PROP_FLAG_P(slot) &= ~IS_PROP_UNINIT;`
`1156`	`1156`	`return;`
`1157`	`1157`	`}`
`1158`	`1158`	`} else if (EXPECTED(IS_DYNAMIC_PROPERTY_OFFSET(property_offset))`
`@@ -1760,7 +1760,7 @@ ZEND_API int zend_std_has_property(zend_object zobj, zend_string name, int has`
`1760`	`1760`	`if (Z_TYPE_P(value) != IS_UNDEF) {`
`1761`	`1761`	`goto found;`
`1762`	`1762`	`}`
`1763`		`- if (UNEXPECTED(Z_PROP_FLAG_P(value) == IS_PROP_UNINIT)) {`
	`1763`	`+ if (UNEXPECTED(Z_PROP_FLAG_P(value) & IS_PROP_UNINIT)) {`
`1764`	`1764`	`/* Skip __isset() for uninitialized typed properties */`
`1765`	`1765`	`result = 0;`
`1766`	`1766`	`goto exit;`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object,`
`214`	`214`	`prop_info = zend_get_property_info_for_slot(new_object, dst);`
`215`	`215`	`if (UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {`
`216`	`216`	`slot = OBJ_PROP(new_object, prop_info->offset);`
`217`		`- Z_PROP_FLAG_P(slot) = IS_PROP_UNINIT;`
	`217`	`+ Z_PROP_FLAG_P(slot) \|= IS_PROP_UNINIT;`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`src++;`
`@@ -272,8 +272,8 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object,`
`272`	`272`	`prop_info = zend_get_property_info_for_slot(new_object, dst);`
`273`	`273`	`if (UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {`
`274`	`274`	`slot = OBJ_PROP(new_object, prop_info->offset);`
`275`		`- if (Z_TYPE_P(slot) != IS_UNDEF && Z_PROP_FLAG_P(slot) == IS_PROP_UNINIT) {`
`276`		`- Z_PROP_FLAG_P(slot) = 0;`
	`275`	`+ if (Z_TYPE_P(slot) != IS_UNDEF && (Z_PROP_FLAG_P(slot) & IS_PROP_UNINIT)) {`
	`276`	`+ Z_PROP_FLAG_P(slot) &= ~IS_PROP_UNINIT;`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`	`dst++;`
Original file line number	Diff line number	Diff line change
`@@ -1208,7 +1208,7 @@ ZEND_VM_C_LABEL(assign_dim_op_new_array):`
`1208`	`1208`	`zend_object *obj = Z_OBJ_P(container);`
`1209`	`1209`
`1210`	`1210`	`dim = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);`
`1211`		`- if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {`
	`1211`	`+ if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {`
`1212`	`1212`	`dim++;`
`1213`	`1213`	`}`
`1214`	`1214`	`zend_binary_assign_op_obj_dim(obj, dim OPLINE_CC EXECUTE_DATA_CC);`
`@@ -1911,7 +1911,7 @@ ZEND_VM_C_LABEL(fetch_dim_r_array):`
`1911`	`1911`	`}`
`1912`	`1912`	`} else {`
`1913`	`1913`	`ZEND_VM_C_LABEL(fetch_dim_r_slow):`
`1914`		`- if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {`
	`1914`	`+ if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {`
`1915`	`1915`	`dim++;`
`1916`	`1916`	`}`
`1917`	`1917`	`zend_fetch_dimension_address_read_R_slow(container, dim OPLINE_CC EXECUTE_DATA_CC);`
`@@ -2614,7 +2614,7 @@ ZEND_VM_C_LABEL(try_assign_dim_array):`
`2614`	`2614`	`dim = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);`
`2615`	`2615`	`if (OP2_TYPE == IS_CV && UNEXPECTED(Z_ISUNDEF_P(dim))) {`
`2616`	`2616`	`dim = ZVAL_UNDEFINED_OP2();`
`2617`		`- } else if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {`
	`2617`	`+ } else if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {`
`2618`	`2618`	`dim++;`
`2619`	`2619`	`}`
`2620`	`2620`
`@@ -6537,7 +6537,7 @@ ZEND_VM_C_LABEL(num_index_dim):`
`6537`	`6537`	`offset = ZVAL_UNDEFINED_OP2();`
`6538`	`6538`	`}`
`6539`	`6539`	`if (EXPECTED(Z_TYPE_P(container) == IS_OBJECT)) {`
`6540`		`- if (OP2_TYPE == IS_CONST && Z_EXTRA_P(offset) == ZEND_EXTRA_VALUE) {`
	`6540`	`+ if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(offset) & ZEND_EXTRA_VALUE)) {`
`6541`	`6541`	`offset++;`
`6542`	`6542`	`}`
`6543`	`6543`	`Z_OBJ_HT_P(container)->unset_dimension(Z_OBJ_P(container), offset);`
`@@ -7312,7 +7312,7 @@ ZEND_VM_C_LABEL(num_index_prop):`
`7312`	`7312`	`}`
`7313`	`7313`	`}`
`7314`	`7314`
`7315`		`- if (OP2_TYPE == IS_CONST && Z_EXTRA_P(offset) == ZEND_EXTRA_VALUE) {`
	`7315`	`+ if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(offset) & ZEND_EXTRA_VALUE)) {`
`7316`	`7316`	`offset++;`
`7317`	`7317`	`}`
`7318`	`7318`	`if (!(opline->extended_value & ZEND_ISEMPTY)) {`
`@@ -9775,7 +9775,7 @@ ZEND_VM_C_LABEL(fetch_dim_r_index_array):`
`9775`	`9775`	`} else {`
`9776`	`9776`	`ZEND_VM_C_LABEL(fetch_dim_r_index_slow):`
`9777`	`9777`	`SAVE_OPLINE();`
`9778`		`- if (OP2_TYPE == IS_CONST && Z_EXTRA_P(dim) == ZEND_EXTRA_VALUE) {`
	`9778`	`+ if (OP2_TYPE == IS_CONST && (Z_EXTRA_P(dim) & ZEND_EXTRA_VALUE)) {`
`9779`	`9779`	`dim++;`
`9780`	`9780`	`}`
`9781`	`9781`	`zend_fetch_dimension_address_read_R_slow(container, dim OPLINE_CC EXECUTE_DATA_CC);`