From f7556aaec3e41bc2314849dbd5de482ebf87a0d1 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 6 Jan 2009 14:44:02 +0000 Subject: [PATCH] re PR bootstrap/38742 (Gcc failed to boostrap with --enable-checking=assert) 2009-01-06 H.J. Lu PR bootstrap/38742 * ira-color.c (ira_reuse_stack_slot): Check ENABLE_IRA_CHECKING before using pseudos_have_intersected_live_ranges_p. * ira-int.h (ira_assert): Always define. From-SVN: r143117 --- gcc/ChangeLog | 8 ++++++++ gcc/ira-color.c | 2 ++ gcc/ira-int.h | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 72df4c283df9..9c9a5fad3e86 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2009-01-06 H.J. Lu + + PR bootstrap/38742 + * ira-color.c (ira_reuse_stack_slot): Check ENABLE_IRA_CHECKING + before using pseudos_have_intersected_live_ranges_p. + + * ira-int.h (ira_assert): Always define. + 2009-01-06 H.J. Lu AVX Programming Reference (December, 2008) diff --git a/gcc/ira-color.c b/gcc/ira-color.c index c7c600bc41c5..f1adb1da06a2 100644 --- a/gcc/ira-color.c +++ b/gcc/ira-color.c @@ -3037,11 +3037,13 @@ ira_reuse_stack_slot (int regno, unsigned int inherent_size, if (x != NULL_RTX) { ira_assert (slot->width >= total_size); +#ifdef ENABLE_IRA_CHECKING EXECUTE_IF_SET_IN_BITMAP (&slot->spilled_regs, FIRST_PSEUDO_REGISTER, i, bi) { ira_assert (! pseudos_have_intersected_live_ranges_p (regno, i)); } +#endif SET_REGNO_REG_SET (&slot->spilled_regs, regno); if (internal_flag_ira_verbose > 3 && ira_dump_file) { diff --git a/gcc/ira-int.h b/gcc/ira-int.h index 1fc6da265e2f..b6605d59a7a9 100644 --- a/gcc/ira-int.h +++ b/gcc/ira-int.h @@ -33,7 +33,9 @@ along with GCC; see the file COPYING3. If not see #ifdef ENABLE_IRA_CHECKING #define ira_assert(c) gcc_assert (c) #else -#define ira_assert(c) +/* Always define and include C, so that warnings for empty body in an + ‘if’ statement and unused variable do not occur. */ +#define ira_assert(c) ((void)(0 && (c))) #endif /* Compute register frequency from edge frequency FREQ. It is -- 2.47.2