lra-int.h (lra_assert): Redefine it gcc_checking_assert.

2012-10-25  Vladimir Makarov  <vmakarov@redhat.com>

	* 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4cda585bbd6b4d8c324b6427929957347fb12789..1fd2aaeee4b0eb809ceae8f0a18125ee7e4c4e95 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-25  Vladimir Makarov  <vmakarov@redhat.com>
+
+       * 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  <ralf.corsepius@rtems.org>
 
        * config/avr/rtems.h (TARGET_OS_CPP_BUILTINS): Remove

diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 4b357261bbe24f7232448ff2aa584602f39a8b48..f3729d203fc12ce6130c6e9f440c8cb436d3abf4 100644 (file)
--- 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 d00cc12feff192fc7c47f5e594ee749c64787245..f88145b7e73d3f52f88f3e47085ac972358a363d 100644 (file)
--- 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