From: Jeff Law <law@redhat.com>
Date: Fri, 7 Apr 2017 14:26:05 +0000 (-0600)
Subject: iq2000.c (final_prescan_insn): Do not separate a CALL and NOTE_INSN_CALL_ARG_LOCATION.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3d1043293beed1696e6cb68f19d3bd6fb44c3b0;p=gcc.git

iq2000.c (final_prescan_insn): Do not separate a CALL and NOTE_INSN_CALL_ARG_LOCATION.

	* config/iq2000/iq2000.c (final_prescan_insn): Do not separate a
	CALL and NOTE_INSN_CALL_ARG_LOCATION.

From-SVN: r246761
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 099805db137..d68f161ca17 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-07  Jeff Law  <law@redhat.com>
+
+	* config/iq2000/iq2000.c (final_prescan_insn): Do not separate a
+	CALL and NOTE_INSN_CALL_ARG_LOCATION.
+
 2017-04-07  Martin Liska  <mliska@suse.cz>
 
 	PR target/79889
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index 7e1ba0067a7..99abd76c5a6 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -1540,8 +1540,13 @@ final_prescan_insn (rtx_insn *insn, rtx opvec[] ATTRIBUTE_UNUSED,
        || (GET_CODE (PATTERN (insn)) == RETURN))
 	   && NEXT_INSN (PREV_INSN (insn)) == insn)
     {
-      rtx_insn *nop_insn = emit_insn_after (gen_nop (), insn);
+      rtx_insn *tmp = insn;
+      while (NEXT_INSN (tmp)
+	     && NOTE_P (NEXT_INSN (tmp))
+	     && NOTE_KIND (NEXT_INSN (tmp)) == NOTE_INSN_CALL_ARG_LOCATION)
+	tmp = NEXT_INSN (tmp);
 
+      rtx_insn *nop_insn = emit_insn_after (gen_nop (), tmp);
       INSN_ADDRESSES_NEW (nop_insn, -1);
     }