From a202e60986930df96c5db13b3890bfea7ae1d981 Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Fri, 26 Oct 2012 03:41:19 +0000 Subject: [PATCH] lra-int.h (lra_assert): Redefine it gcc_checking_assert. 2012-10-25 Vladimir Makarov * lra-int.h (lra_assert): Redefine it gcc_checking_assert. * lra-constraints.c (check_and_process_move): Remove #if ENABLE_ASSERT_CHECKING. From-SVN: r192832 --- gcc/ChangeLog | 6 ++++++ gcc/lra-constraints.c | 2 -- gcc/lra-int.h | 8 +------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4cda585bbd6..1fd2aaeee4b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-10-25 Vladimir Makarov + + * lra-int.h (lra_assert): Redefine it gcc_checking_assert. + * lra-constraints.c (check_and_process_move): Remove #if + ENABLE_ASSERT_CHECKING. + 2012-10-26 Ralf Corsépius * config/avr/rtems.h (TARGET_OS_CPP_BUILTINS): Remove diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 4b357261bbe..f3729d203fc 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -1204,10 +1204,8 @@ check_and_process_move (bool *change_p, bool *sec_mem_p) || ((secondary_class != NO_REGS || sri.icode != CODE_FOR_nothing) && dclass != NO_REGS)) { -#if ENABLE_ASSERT_CHECKING enum reg_class old_sclass = secondary_class; secondary_reload_info old_sri = sri; -#endif sri.prev_sri = NULL; sri.icode = CODE_FOR_nothing; diff --git a/gcc/lra-int.h b/gcc/lra-int.h index d00cc12feff..f88145b7e73 100644 --- a/gcc/lra-int.h +++ b/gcc/lra-int.h @@ -25,13 +25,7 @@ along with GCC; see the file COPYING3. If not see #include "insn-attr.h" #include "insn-codes.h" -#ifdef ENABLE_CHECKING -#define lra_assert(c) gcc_assert (c) -#else -/* Always define and include C, so that warnings for empty body in an - ‘if’ statement and unused variable do not occur. */ -#define lra_assert(c) ((void)(0 && (c))) -#endif +#define lra_assert(c) gcc_checking_assert (c) /* The parameter used to prevent infinite reloading for an insn. Each insn operands might require a reload and, if it is a memory, its -- 2.30.2