From 2f894389b650511f57ba34b442b0ef3004fa2b3d Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Thu, 8 Feb 2024 11:58:22 +0100 Subject: [PATCH] Revert "Use __attribute__((assume())) in ZEND_ASSUME when available" This reverts commit bf4ec8bd9d9d30713a9d3294b946084a6e9e088a. Partial revert, keep the phpdbg changes. --- Zend/zend_portability.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index 26d591b0a4c..0dd4e6487a0 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -89,9 +89,6 @@ #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)