From: sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 3 Mar 2005 14:16:05 +0000 (+0000)
Subject: 	* jump.c (redirect_exp_1): If nlabel is a NULL pointer create a
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae6fb586d7e7a6bc62933732acbd425e64731cc3;p=thirdparty%2Fgcc.git

	* jump.c (redirect_exp_1): If nlabel is a NULL pointer create a
	RETURN rtx, and not a LABEL_REF containing a NULL pointer.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db71b1e4e109..eb1ad100fb0c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-03  Roger Sayle  <roger@eyesopen.com>
+	    Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* jump.c (redirect_exp_1): If nlabel is a NULL pointer create a
+	RETURN rtx, and not a LABEL_REF containing a NULL pointer.
+
 2005-03-03  Hans-Peter Nilsson  <hp@axis.com>
 
 	Describe special registers SRP and MOF as allocatable registers.
diff --git a/gcc/jump.c b/gcc/jump.c
index 4af8b5a5a10e..2bf4b2a50843 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -1539,7 +1539,10 @@ redirect_exp_1 (rtx *loc, rtx olabel, rtx nlabel, rtx insn)
     }
   else if (code == RETURN && olabel == 0)
     {
-      x = gen_rtx_LABEL_REF (VOIDmode, nlabel);
+      if (nlabel)
+	x = gen_rtx_LABEL_REF (VOIDmode, nlabel);
+      else
+	x = gen_rtx_RETURN (VOIDmode);
       if (loc == &PATTERN (insn))
 	x = gen_rtx_SET (VOIDmode, pc_rtx, x);
       validate_change (insn, loc, x, 1);