From: Hariharan Sandanagobalane <hariharan@picochip.com>
Date: Fri, 27 May 2011 08:27:23 +0000 (+0000)
Subject: picochip.c (reorder_var_tracking_notes): Drop call_arg_location instructions down... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dc38fc2e8a3b5ce18e6a22ea160da5ff7ecb0e4b;p=gcc.git

picochip.c (reorder_var_tracking_notes): Drop call_arg_location instructions down the floor.

        * config/picochip/picochip.c (reorder_var_tracking_notes): Drop
        call_arg_location instructions down the floor.

From-SVN: r174322
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e487e407f2..43cce51e977 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-27  Hariharan Sandanagobalane <hariharan@picochip.com>
+
+	* config/picochip/picochip.c (reorder_var_tracking_notes): Drop
+	call_arg_location instructions down the floor.
+
 2011-05-26  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR rtl-optimization/49154
diff --git a/gcc/config/picochip/picochip.c b/gcc/config/picochip/picochip.c
index 8c2a61bb7ef..f7f1646901d 100644
--- a/gcc/config/picochip/picochip.c
+++ b/gcc/config/picochip/picochip.c
@@ -3243,13 +3243,20 @@ reorder_var_tracking_notes (void)
                     }
                 }
             }
-          else if (NOTE_P (insn) && NOTE_KIND (insn) == NOTE_INSN_VAR_LOCATION)
+          else if (NOTE_P (insn))
             {
                rtx prev = PREV_INSN (insn);
                PREV_INSN (next) = prev;
                NEXT_INSN (prev) = next;
-               PREV_INSN (insn) = queue;
-               queue = insn;
+               /* Ignore call_arg notes. They are expected to be just after the
+                  call insn. If the call is start of a long VLIW, labels are
+                  emitted in the middle of a VLIW, which our assembler can not
+                  handle. */
+               if (NOTE_KIND (insn) != NOTE_INSN_CALL_ARG_LOCATION)
+                 {
+                   PREV_INSN (insn) = queue;
+                   queue = insn;
+                 }
             }
         }
         /* Make sure we are not dropping debug instructions.*/