diff options
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/sched-deps.c | 6 | ||||
-rw-r--r-- | gcc/sched-int.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f61412c..8e5fb12 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2013-04-13 Steven Bosscher <steven@gcc.gnu.org> + * sched-deps.c (deps_analyze_insn): Do not check for EH_REGION insn + notes, they are emitted only just before final. + * sched-int.h: Include insn-attr.h before checking INSN_SCHEDULING. + +2013-04-13 Steven Bosscher <steven@gcc.gnu.org> + * emit-rtl.c (remove_insn): Do not call df_insn_delete here. * cfgrtl.c (delete_insn): Call it here instead. * lra-spills.c (lra_final_code_change): Use delete_insn. diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c index 07857f2..fde684f 100644 --- a/gcc/sched-deps.c +++ b/gcc/sched-deps.c @@ -3680,12 +3680,6 @@ deps_analyze_insn (struct deps_desc *deps, rtx insn) if (sched_deps_info->use_cselib) cselib_process_insn (insn); - /* EH_REGION insn notes can not appear until well after we complete - scheduling. */ - if (NOTE_P (insn)) - gcc_assert (NOTE_KIND (insn) != NOTE_INSN_EH_REGION_BEG - && NOTE_KIND (insn) != NOTE_INSN_EH_REGION_END); - if (sched_deps_info->finish_insn) sched_deps_info->finish_insn (); diff --git a/gcc/sched-int.h b/gcc/sched-int.h index 24a3414..9ab3374 100644 --- a/gcc/sched-int.h +++ b/gcc/sched-int.h @@ -21,10 +21,10 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_SCHED_INT_H #define GCC_SCHED_INT_H +#include "insn-attr.h" + #ifdef INSN_SCHEDULING -/* For state_t. */ -#include "insn-attr.h" #include "df.h" #include "basic-block.h" |