diff mbox

[committed] Work around problem in gen-pass-instances.awk

Message ID a39e9d40-5c0c-5f4f-d011-0d99da814b20@gjlay.de
State New
Headers show

Commit Message

Georg-Johann Lay Oct. 26, 2016, 9:54 a.m. UTC 
gen-pass-instances.awk is sensitive to the order in which directives are 
written down, e.g. in target-pass.def: If a pass that runs first is added 
first, then the last pass is skipped and not added to pass-instances.def.

Work around is to add the 2nd pass before adding the 1st pass...

http://gcc.gnu.org/r241547

No so obvious, but committed anyway...

Johann

	gen-pass-instances.awk is sensitive to the order in which
	passes are added; passes that appear later have to be added first.

	PR target/71676
	PR target/71678
	* config/avr/avr-passes.def: Swap order of directives for
	gen-pass-instances.awk.
diff mbox

Patch

Index: config/avr/avr-passes.def
===================================================================
--- config/avr/avr-passes.def   (revision 241546)
+++ config/avr/avr-passes.def   (revision 241547)
@@ -17,6 +17,19 @@ 
     along with GCC; see the file COPYING3.  If not see
     <http://www.gnu.org/licenses/>.  */

+/* FIXME: We have to add the last pass first, otherwise
+          gen-pass-instances.awk won't work as expected. */
+
+/* This avr-specific pass (re)computes insn notes, in particular REG_DEAD
+   notes which are used by `avr.c::reg_unused_after' and branch offset
+   computations.  These notes must be correct, i.e. there must be no
+   dangling REG_DEAD notes; otherwise wrong code might result, cf. PR64331.
+
+   DF needs (correct) CFG, hence right before free_cfg is the last
+   opportunity to rectify notes.  */
+
+INSERT_PASS_BEFORE (pass_free_cfg, 1, avr_pass_recompute_notes);
+
  /* casesi uses a SImode switch index which is quite costly as most code will
     work on HImode or QImode.  The following pass runs right after .expand and
     tries to fix such situations by operating on the original mode.  This
@@ -27,13 +40,3 @@ 
     insns withaout any insns in between.  */

  INSERT_PASS_AFTER (pass_expand, 1, avr_pass_casesi);
-
-/* This avr-specific pass (re)computes insn notes, in particular REG_DEAD
-   notes which are used by `avr.c::reg_unused_after' and branch offset
-   computations.  These notes must be correct, i.e. there must be no
-   dangling REG_DEAD notes; otherwise wrong code might result, cf. PR64331.
-
-   DF needs (correct) CFG, hence right before free_cfg is the last
-   opportunity to rectify notes.  */
-
-INSERT_PASS_BEFORE (pass_free_cfg, 1, avr_pass_recompute_notes);