aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2004-11-25 18:04:11 -0800
committerRichard Henderson <rth@gcc.gnu.org>2004-11-25 18:04:11 -0800
commit58767f002acb70b56e3d342607a2c9789bf761e8 (patch)
tree3fa952152c9b5c12679f9886dabc9757ef4bd77b /gcc
parentc9ffaa8d79d65e1386541e508c8c281c9b63428e (diff)
downloadgcc-58767f002acb70b56e3d342607a2c9789bf761e8.zip
gcc-58767f002acb70b56e3d342607a2c9789bf761e8.tar.gz
gcc-58767f002acb70b56e3d342607a2c9789bf761e8.tar.bz2
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: r91318
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/reload1.c10
-rw-r--r--gcc/testsuite/g++.dg/opt/eh2.C34
3 files changed, 50 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8358ecf..c4f82e35 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-25 Ricahrd Henderson <rth@redhat.com>
+
+ PR c++/6764
+ * reload1.c (set_initial_eh_label_offset): New.
+ (set_initial_label_offsets): Use it.
+
2004-11-25 Kaz Kojima <kkojima@gcc.gnu.org>
* config/sh/sh.c (sh_output_mi_thunk): Initialize bitmap obstacks
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 9ffa798..c90c8b6 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -3316,6 +3316,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
@@ -3332,6 +3340,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
diff --git a/gcc/testsuite/g++.dg/opt/eh2.C b/gcc/testsuite/g++.dg/opt/eh2.C
new file mode 100644
index 0000000..7cb49f0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/eh2.C
@@ -0,0 +1,34 @@
+// PR 6764
+// { dg-do run }
+// { dg-options "-O -fomit-frame-pointer" }
+
+extern "C" void abort ();
+
+class test
+{
+ public:
+ test * const me;
+ test () : me(this) { }
+ ~test () { if (me != this) abort (); }
+};
+
+void x1 ()
+{
+ test w1;
+ throw 1;
+}
+
+void x2 ()
+{
+ test w2;
+ x1 ();
+}
+
+int main (void)
+{
+ try {
+ x2 ();
+ } catch (...) {
+ }
+ return 0;
+}