except.c (expand_builtin_throw): Replace remaining use of saved_throw_type with a...

        * except.c (expand_builtin_throw) [!DWARF2_UNWIND_INFO]: Replace
        remaining use of saved_throw_type with a call to get_eh_type.

From-SVN: r16260

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 78df28f00150e9a1a9e735f4579552f68027f7ca..8c88225e6e9d20a9af44e8010e00bbacad625e00 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1997-11-01  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+       * except.c (expand_builtin_throw) [!DWARF2_UNWIND_INFO]: Replace
+       remaining use of saved_throw_type with a call to get_eh_type.
+
 1997-10-31  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
        * except.c (push_eh_info): Pass the number of fields - 1 down, not

diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index cb59774728ac302bad3c66373921b40f907032e5..fe8c8265b58040f6e7838bf261c3d5a23060d574 100644 (file)
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -814,8 +814,9 @@ expand_builtin_throw ()
   /* These two can be frontend specific.  If wanted, they can go in
      expand_throw.  */
   /* Do we have a valid object we are throwing? */
-  emit_cmp_insn (DECL_RTL (saved_throw_type), const0_rtx, EQ, NULL_RTX,
-                GET_MODE (DECL_RTL (saved_throw_type)), 0, 0);
+  t = get_eh_type ();
+  emit_cmp_insn (DECL_RTL (t), const0_rtx, EQ, NULL_RTX,
+                GET_MODE (DECL_RTL (t)), 0, 0);
   emit_jump_insn (gen_beq (gotta_call_terminate));
 
   /* search for an exception handler for the saved_pc */