From: Bernd Schmidt <bernds@codesourcery.com>
Date: Thu, 28 Jul 2011 22:47:21 +0000 (+0000)
Subject: re PR rtl-optimization/49891 (ICE in redirect_jump_1)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e40a0b691b871198b495c035736f55e074542296;p=gcc.git

re PR rtl-optimization/49891 (ICE in redirect_jump_1)

	PR rtl-optimization/49891
	* cfgrtl.c (force_nonfallthru_and_redirect): Set JUMP_LABEL for
	newly created returnjumps.

From-SVN: r176905
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 015724c506d..c304e8245b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-29  Bernd Schmidt  <bernds@codesourcery.com>
+
+	PR rtl-optimization/49891
+	* cfgrtl.c (force_nonfallthru_and_redirect): Set JUMP_LABEL for
+	newly created returnjumps.
+
 2011-07-28  DJ Delorie  <dj@redhat.com>
 
 	* expr.c (expand_expr_addr_expr_1): Detect a user request for a
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 69377957cd6..b60041ad9c8 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -1254,6 +1254,7 @@ force_nonfallthru_and_redirect (edge e, basic_block target)
     {
 #ifdef HAVE_return
 	emit_jump_insn_after_setloc (gen_return (), BB_END (jump_block), loc);
+	JUMP_LABEL (BB_END (jump_block)) = ret_rtx;
 #else
 	gcc_unreachable ();
 #endif