Add [UN]EXPECTED hints

Author: iluuu1994

Zend/zend_execute.c

@@ -3209,7 +3209,7 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c
 						 * to make sure no actual modification is possible. */
 						ZEND_ASSERT(type == BP_VAR_W || type == BP_VAR_RW || type == BP_VAR_UNSET);
 						if (Z_TYPE_P(ptr) == IS_OBJECT
-						 && !(Z_OBJCE_P(ptr)->ce_flags & ZEND_ACC_DATA_CLASS)) {
+						 && EXPECTED(!(Z_OBJCE_P(ptr)->ce_flags & ZEND_ACC_DATA_CLASS))) {
 							ZVAL_COPY(result, ptr);
 						} else if (Z_PROP_FLAG_P(ptr) & IS_PROP_REINITABLE) {
 							Z_PROP_FLAG_P(ptr) &= ~IS_PROP_REINITABLE;

Zend/zend_object_handlers.c

@@ -624,7 +624,7 @@ ZEND_API zval *zend_std_read_property(zend_object *zobj, zend_string *name, int
 			if (prop_info && UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)
 					&& (type == BP_VAR_W || type == BP_VAR_RW || type == BP_VAR_UNSET)) {
 				if (Z_TYPE_P(retval) == IS_OBJECT
-				 && !(Z_OBJCE_P(retval)->ce_flags & ZEND_ACC_DATA_CLASS)) {
+				 && EXPECTED(!(Z_OBJCE_P(retval)->ce_flags & ZEND_ACC_DATA_CLASS))) {
 					/* For objects, W/RW/UNSET fetch modes might not actually modify object.
 					 * Similar as with magic __get() allow them, but return the value as a copy
 					 * to make sure no actual modification is possible. */

Zend/zend_operators.c

@@ -2452,7 +2452,7 @@ ZEND_API bool ZEND_FASTCALL zend_is_identical(const zval *op1, const zval *op2)
 			if (Z_OBJ_P(op1) == Z_OBJ_P(op2)) {
 				return true;
 			}
-			if ((Z_OBJCE_P(op1)->ce_flags & ZEND_ACC_DATA_CLASS)
+			if (UNEXPECTED(Z_OBJCE_P(op1)->ce_flags & ZEND_ACC_DATA_CLASS)
 			 && Z_OBJCE_P(op1) == Z_OBJCE_P(op2)) {
 				return zend_is_identical_data_class(op1, op2);
 			}

Zend/zend_types.h

@@ -1530,7 +1530,7 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) {
 		zval *_zv = (zv);								\
 		ZEND_ASSERT(Z_TYPE_P(_zv) == IS_OBJECT);		\
 		zend_object *obj = Z_OBJ_P(_zv);				\
-		if ((obj->ce->ce_flags & ZEND_ACC_DATA_CLASS)	\
+		if (UNEXPECTED(obj->ce->ce_flags & ZEND_ACC_DATA_CLASS)	\
 		 && GC_REFCOUNT(obj) > 1) {						\
 			zend_object_clone_obj_t clone_call = obj->handlers->clone_obj;	\
 			ZEND_ASSERT(clone_call);					\

Zend/zend_vm_def.h

@@ -9105,7 +9105,7 @@ ZEND_VM_HOT_HANDLER(184, ZEND_FETCH_THIS, UNUSED, UNUSED)
 	if (EXPECTED(Z_TYPE(EX(This)) == IS_OBJECT)) {
 		zval *result = EX_VAR(opline->result.var);
 
-		if (!(Z_OBJCE(EX(This))->ce_flags & ZEND_ACC_DATA_CLASS)) {
+		if (EXPECTED(!(Z_OBJCE(EX(This))->ce_flags & ZEND_ACC_DATA_CLASS))) {
 			ZVAL_OBJ(result, Z_OBJ(EX(This)));
 			Z_ADDREF_P(result);
 		} else {

ext/reflection/php_reflection.c

@@ -3434,7 +3434,7 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic)
 			RETURN_THROWS();
 		}
 
-		if (Z_OBJCE_P(object)->ce_flags & ZEND_ACC_DATA_CLASS) {
+		if (UNEXPECTED(Z_OBJCE_P(object)->ce_flags & ZEND_ACC_DATA_CLASS)) {
 			zend_throw_exception_ex(reflection_exception_ptr, 0,
 				"May not invoke mutating method \"%s::%s()\" through reflection",
 				ZSTR_VAL(Z_OBJCE_P(object)->name), ZSTR_VAL(mptr->common.function_name));
@@ -5775,7 +5775,7 @@ ZEND_METHOD(ReflectionProperty, setValue)
 			RETURN_THROWS();
 		}
 
-		if (Z_OBJCE_P(object)->ce_flags & ZEND_ACC_DATA_CLASS) {
+		if (UNEXPECTED(Z_OBJCE_P(object)->ce_flags & ZEND_ACC_DATA_CLASS)) {
 			zend_throw_exception_ex(reflection_exception_ptr, 0,
 				"May not set property value of data class \"%s\" through reflection",
 				ZSTR_VAL(Z_OBJCE_P(object)->name));