From: danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 28 Sep 2014 15:39:23 +0000 (+0000)
Subject: 	* config/pa/pa.c (pa_output_function_epilogue): Only update
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93801ad9bc15978ae36835acf0aa252445901024;p=thirdparty%2Fgcc.git

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



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215669 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c416972b0f5..8628256afb8e 100644
--- 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-26  Jan Hubicka  <hubicka@ucw.cz>	
 	
 	PR ipa/60665
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 20f2ef662d38..59755f28da51 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -4192,9 +4192,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));
     }