Use __attribute__((assume())) in ZEND_ASSUME when available

Closes GH-13171

Author: iluuu1994

Zend/zend_portability.h

@@ -89,6 +89,9 @@
 
 #if defined(ZEND_WIN32) && !defined(__clang__)
 # define ZEND_ASSUME(c)	__assume(c)
+#elif defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 13
+/* GCC emits a warning when __attribute__ appears directly after a label, so we need a do-while loop. */
+# define ZEND_ASSUME(c)	do { __attribute__((assume(c))); } while (0)
 #elif defined(__clang__) && __has_builtin(__builtin_assume)
 # pragma clang diagnostic ignored "-Wassume"
 # define ZEND_ASSUME(c)	__builtin_assume(c)

sapi/phpdbg/phpdbg_watch.c

@@ -333,8 +333,10 @@ void *phpdbg_watchpoint_userfaultfd_thread(void *phpdbg_globals) {
 
 /* ### REGISTER WATCHPOINT ### To be used only by watch element and collision managers ### */
 static inline void phpdbg_store_watchpoint_btree(phpdbg_watchpoint_t *watch) {
-	phpdbg_btree_result *res;
-	ZEND_ASSERT((res = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong) watch->addr.ptr)) == NULL || res->ptr == watch);
+#if ZEND_DEBUG
+	phpdbg_btree_result *res = phpdbg_btree_find(&PHPDBG_G(watchpoint_tree), (zend_ulong) watch->addr.ptr);
+	ZEND_ASSERT(res == NULL || res->ptr == watch);
+#endif
 	phpdbg_btree_insert(&PHPDBG_G(watchpoint_tree), (zend_ulong) watch->addr.ptr, watch);
 }