re PR rtl-optimization/47918 (noreturn discovery broke non local gotos on m68k and...

	PR rtl-optimization/47918

	* reload1.c (set_initial_label_offsets): Use initial offsets
	for labels on the nonlocal_goto_handler_labels chain.

From-SVN: r180740

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 296ac8c181e40a01702a8bfbd2cf70c0454bec4a..a06f0e31b85793a9c8e1a1ffe01b57fd30cdb354 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-01  Julian Brown  <julian@codesourcery.com>
+
+       PR rtl-optimization/47918
+
+       * reload1.c (set_initial_label_offsets): Use initial offsets
+       for labels on the nonlocal_goto_handler_labels chain.
+
 2011-10-29  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        PR target/50691

diff --git a/gcc/reload1.c b/gcc/reload1.c
index cee127f936baaabd3e1eed2add1c9c386d268d78..84cbfca17aa88c55ec63fad1ff0debb466287d1a 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -3899,6 +3899,10 @@ set_initial_label_offsets (void)
     if (XEXP (x, 0))
       set_label_offsets (XEXP (x, 0), NULL_RTX, 1);
 
+  for (x = nonlocal_goto_handler_labels; x; x = XEXP (x, 1))
+    if (XEXP (x, 0))
+      set_label_offsets (XEXP (x, 0), NULL_RTX, 1);
+
   for_each_eh_label (set_initial_eh_label_offset);
 }