pa.c (pa_output_function_epilogue): Only update last_address when a nonnote insn...

	* config/pa/pa.c (pa_output_function_epilogue): Only update
	last_address when a nonnote insn is found.

From-SVN: r215671

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e7516199e242078fc4e1dad4a8df317b7ebd32f..466d1806a38bd25b42579023a19e195fcc247f04 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-28  John David Anglin  <danglin@gcc.gnu.org>
+
+       * config/pa/pa.c (pa_output_function_epilogue): Only update
+       last_address when a nonnote insn is found.
+
 2014-09-25  Oleg Endo  <olegendo@gcc.gnu.org>
 
        Backport from mainline

diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index bd358f9c3c52460e7e2997ad2dad2f8ba1826edd..47fd47f196db34bd0a3232b6390e0bb4f7686263 100644 (file)
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -4213,9 +4213,12 @@ pa_output_function_epilogue (FILE *file, HOST_WIDE_INT size ATTRIBUTE_UNUSED)
     {
       last_address = extra_nop ? 4 : 0;
       insn = get_last_nonnote_insn ();
-      last_address += INSN_ADDRESSES (INSN_UID (insn));
-      if (INSN_P (insn))
-       last_address += insn_default_length (insn);
+      if (insn)
+       {
+         last_address += INSN_ADDRESSES (INSN_UID (insn));
+         if (INSN_P (insn))
+           last_address += insn_default_length (insn);
+       }
       last_address = ((last_address + FUNCTION_BOUNDARY / BITS_PER_UNIT - 1)
                      & ~(FUNCTION_BOUNDARY / BITS_PER_UNIT - 1));
     }