sched-deps.c (deps_analyze_insn): Do not check for EH_REGION insn notes, they are...

	* 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.

From-SVN: r197945

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f61412c5b69f09d6992d42e3d5d612195ef884dc..8e5fb120aac6e7d34dda6367ca9d0cd8cf06879c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 07857f2d6bff70f826d7a9c31051fab4c230b876..fde684fec3a6c238e2cc53ac45880f536bdb1492 100644 (file)
--- 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 24a34142aa1b09aa4c9ec8bb338e0047cffd9a70..9ab3374478000de98972f18c504a8db824914012 100644 (file)
--- 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"