From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 9B21B385741A; Thu, 5 May 2022 18:19:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B21B385741A MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/fold-GCC_VERSION-for-old-v2)] Remove conditional STATIC_ASSERT. X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Martin_Li=C5=A1ka?= X-Git-Refname: refs/users/marxin/heads/fold-GCC_VERSION-for-old-v2 X-Git-Oldrev: 79b7dd219b6b0e2b8c9890ae03aab2d299ab9829 X-Git-Newrev: 96cda69869bafe6a84ffb9e82d8932bdcc7f9e85 Message-Id: <20220505181940.9B21B385741A@sourceware.org> Date: Thu, 5 May 2022 18:19:40 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2022 18:19:40 -0000 https://gcc.gnu.org/g:96cda69869bafe6a84ffb9e82d8932bdcc7f9e85 commit 96cda69869bafe6a84ffb9e82d8932bdcc7f9e85 Author: Martin Liška Date: Thu May 5 14:18:58 2022 +0200 Remove conditional STATIC_ASSERT. As we require a c++11 compliant compiler, the #if __cplusplus >= 201103L conditional build is always true. gcc/ChangeLog: * basic-block.h (STATIC_ASSERT): Use normal STATIC_ASSERT. * system.h (STATIC_ASSERT): Define as static_assert for C++ and fallback to array index in C. Diff: --- gcc/basic-block.h | 5 +---- gcc/system.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gcc/basic-block.h b/gcc/basic-block.h index e3fff1f6975..21a9b24dbf9 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -158,10 +158,7 @@ struct GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb"))) basic_block_d /* This ensures that struct gimple_bb_info is smaller than struct rtl_bb_info, so that inlining the former into basic_block_def is the better choice. */ -typedef int __assert_gimple_bb_smaller_rtl_bb - [(int) sizeof (struct rtl_bb_info) - - (int) sizeof (struct gimple_bb_info)]; - +STATIC_ASSERT (sizeof (rtl_bb_info) >= sizeof (gimple_bb_info)); #define BB_FREQ_MAX 10000 diff --git a/gcc/system.h b/gcc/system.h index 1688b763ef5..1bb12a7c62f 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -801,8 +801,7 @@ extern void fancy_abort (const char *, int, const char *) #define STATIC_CONSTANT_P(X) (__builtin_constant_p (X) && (X)) -/* static_assert (COND, MESSAGE) is available in C++11 onwards. */ -#if __cplusplus >= 201103L +#ifdef __cplusplus #define STATIC_ASSERT(X) \ static_assert ((X), #X) #else