Introduce PROGRESS_CACHE_SLOT() macro

Girgias · Girgias · commit 80315edd580c · 2022-09-10T11:34:11.000+01:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1001,6 +1001,8 @@ static zend_always_inline bool zend_value_instanceof_static(zval *zv) {
 # define HAVE_CACHE_SLOT 1
 #endif
 
+#define PROGRESS_CACHE_SLOT() if (HAVE_CACHE_SLOT) {cache_slot++;}
+
 static zend_always_inline zend_class_entry *zend_fetch_ce_from_cache_slot(
 		void **cache_slot, zend_type *type)
 {
@@ -1065,9 +1067,7 @@ static zend_always_inline bool zend_check_type_slow(
 					if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce)) {
 						return false;
 					}
-					if (HAVE_CACHE_SLOT) {
-						cache_slot++;
-					}
+					PROGRESS_CACHE_SLOT();
 				} ZEND_TYPE_LIST_FOREACH_END();
 				return true;
 			} else {
@@ -1085,9 +1085,7 @@ static zend_always_inline bool zend_check_type_slow(
 						}
 					}
 
-					if (HAVE_CACHE_SLOT) {
-						cache_slot++;
-					}
+					PROGRESS_CACHE_SLOT();
 				} ZEND_TYPE_LIST_FOREACH_END();
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -1001,6 +1001,8 @@ static zend_always_inline bool zend_value_instanceof_static(zval *zv) {`
`1001`	`1001`	`# define HAVE_CACHE_SLOT 1`
`1002`	`1002`	`#endif`
`1003`	`1003`
	`1004`	`+#define PROGRESS_CACHE_SLOT() if (HAVE_CACHE_SLOT) {cache_slot++;}`
	`1005`	`+`
`1004`	`1006`	`static zend_always_inline zend_class_entry *zend_fetch_ce_from_cache_slot(`
`1005`	`1007`	`void *cache_slot, zend_type type)`
`1006`	`1008`	`{`
`@@ -1065,9 +1067,7 @@ static zend_always_inline bool zend_check_type_slow(`
`1065`	`1067`	`if (!ce \|\| !instanceof_function(Z_OBJCE_P(arg), ce)) {`
`1066`	`1068`	`return false;`
`1067`	`1069`	`}`
`1068`		`- if (HAVE_CACHE_SLOT) {`
`1069`		`- cache_slot++;`
`1070`		`- }`
	`1070`	`+ PROGRESS_CACHE_SLOT();`
`1071`	`1071`	`} ZEND_TYPE_LIST_FOREACH_END();`
`1072`	`1072`	`return true;`
`1073`	`1073`	`} else {`
`@@ -1085,9 +1085,7 @@ static zend_always_inline bool zend_check_type_slow(`
`1085`	`1085`	`}`
`1086`	`1086`	`}`
`1087`	`1087`
`1088`		`- if (HAVE_CACHE_SLOT) {`
`1089`		`- cache_slot++;`
`1090`		`- }`
	`1088`	`+ PROGRESS_CACHE_SLOT();`
`1091`	`1089`	`} ZEND_TYPE_LIST_FOREACH_END();`
`1092`	`1090`	`}`
`1093`	`1091`	`} else {`