From: Richard Henderson <rth@redhat.com>
Date: Fri, 26 Nov 2004 05:07:25 +0000 (-0800)
Subject: re PR c++/6764 (Throwing exception causes crash with '-O2 -fomit-frame-pointer')
X-Git-Tag: releases/gcc-3.4.4~484
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=495eccc1510b61f1cd2e89cdfe32d18ea79e5adc;p=thirdparty%2Fgcc.git

re PR c++/6764 (Throwing exception causes crash with '-O2 -fomit-frame-pointer')

        PR c++/6764
        * reload1.c (set_initial_eh_label_offset): New.
        (set_initial_label_offsets): Use it.

From-SVN: r91327
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 883c1b197d08..f7ce7dab640d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-25  Richard Henderson  <rth@redhat.com>
+
+	PR c++/6764
+	* reload1.c (set_initial_eh_label_offset): New.
+	(set_initial_label_offsets): Use it.
+
 2004-11-26  Alan Modra  <amodra@bigpond.net.au>
 
 	PR rtl-optimization/16356
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 1055de8059a2..1c8d66078293 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -3324,6 +3324,14 @@ set_initial_elim_offsets (void)
   num_not_at_initial_offset = 0;
 }
 
+/* Subroutine of set_initial_label_offsets called via for_each_eh_label.  */
+
+static void
+set_initial_eh_label_offset (rtx label)
+{
+  set_label_offsets (label, NULL_RTX, 1);
+}
+
 /* Initialize the known label offsets.
    Set a known offset for each forced label to be at the initial offset
    of each elimination.  We do this because we assume that all
@@ -3340,6 +3348,8 @@ set_initial_label_offsets (void)
   for (x = forced_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);
 }
 
 /* Set all elimination offsets to the known values for the code label given