This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
C++ PATCH for EH/vbases
- To: egcs-patches at egcs dot cygnus dot com
- Subject: C++ PATCH for EH/vbases
- From: mark at codesourcery dot com
- Date: Fri, 18 Jun 1999 20:42:08 -0700
- Organization: CodeSourcery, LLC
There was another code-generation issue w.r.t. vbases/exceptions in
constructors that was not covered by yesterday's patch. Here's the
fix.
Note that this will almost certainly *not* fix the problems we are
seeing with DWARF1/Interix regarding the previous change. Donn and I
are still basically stumped as to what on earth is going on there.
Installed on the mainline and branch.
--
Mark Mitchell mark@codesourcery.com
CodeSourcery, LLC http://www.codesourcery.com
1999-06-18 Mark Mitchell <mark@codesourcery.com>
* init.c (expand_aggr_vbase_init): Add flag parameter.
(build_partial_cleanup_for): Remove, inlining into ..
(expand_cleanup_for_base): ... here. Take flag parameter.
(emit_base_init): Pass the in_chrg parameter to
emit_aggr_vbase_init.
(emit_aggr_vbase_init): Pass it to expand_cleanup_for_base.
Index: testsuite/g++.old-deja/g++.eh/vbase2.C
===================================================================
RCS file: vbase2.C
diff -N vbase2.C
--- /dev/null Sat Dec 5 20:30:03 1998
+++ vbase2.C Fri Jun 18 20:32:34 1999
@@ -0,0 +1,34 @@
+// Origin: Mark Mitchell <mark@codesourcery.com>
+
+int i;
+
+struct A
+{
+ A () { i++; }
+ ~A () { i--; }
+};
+
+struct B : public virtual A
+{
+ B () { throw 1; }
+};
+
+struct D: public B, virtual public A
+{
+};
+
+void f()
+{
+ D d;
+}
+
+int main ()
+{
+ try {
+ f();
+ } catch (int) {
+ }
+
+ return i;
+}
+
Index: cp/init.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/init.c,v
retrieving revision 1.109
diff -u -p -r1.109 init.c
--- init.c 1999/06/16 11:24:10 1.109
+++ init.c 1999/06/19 03:32:37
@@ -44,7 +44,7 @@ Boston, MA 02111-1307, USA. */
tree current_base_init_list, current_member_init_list;
static void expand_aggr_vbase_init_1 PROTO((tree, tree, tree, tree));
-static void expand_aggr_vbase_init PROTO((tree, tree, tree, tree));
+static void expand_aggr_vbase_init PROTO((tree, tree, tree, tree, tree));
static void expand_aggr_init_1 PROTO((tree, tree, tree, tree, int));
static void expand_default_init PROTO((tree, tree, tree, tree, int));
static tree build_vec_delete_1 PROTO((tree, tree, tree, tree, tree,
@@ -55,12 +55,11 @@ static tree build_builtin_delete_call PR
static int member_init_ok_or_else PROTO((tree, tree, const char *));
static void expand_virtual_init PROTO((tree, tree));
static tree sort_member_init PROTO((tree));
-static tree build_partial_cleanup_for PROTO((tree));
static tree initializing_context PROTO((tree));
static void expand_vec_init_try_block PROTO((tree));
static void expand_vec_init_catch_clause PROTO((tree, tree, tree, tree));
static tree build_java_class_ref PROTO((tree));
-static void expand_cleanup_for_base PROTO((tree));
+static void expand_cleanup_for_base PROTO((tree, tree));
/* Cache the identifier nodes for the magic field of a new cookie. */
static tree nc_nelts_field_id;
@@ -483,17 +482,6 @@ sort_base_init (t, rbase_ptr, vbase_ptr)
*vbase_ptr = vbases;
}
-/* Perform partial cleanups for a base for exception handling. */
-
-static tree
-build_partial_cleanup_for (binfo)
- tree binfo;
-{
- return build_scoped_method_call
- (current_class_ref, binfo, dtor_identifier,
- build_expr_list (NULL_TREE, integer_zero_node));
-}
-
/* Perform whatever initializations have yet to be done on the base
class of the class variable. These actions are in the global
variable CURRENT_BASE_INIT_LIST. Such an action could be
@@ -559,7 +547,7 @@ emit_base_init (t, immediately)
expand_start_cond (first_arg, 0);
expand_aggr_vbase_init (t_binfo, current_class_ref, current_class_ptr,
- vbase_init_list);
+ vbase_init_list, first_arg);
expand_end_cond ();
}
@@ -598,7 +586,7 @@ emit_base_init (t, immediately)
free_temp_slots ();
}
- expand_cleanup_for_base (base_binfo);
+ expand_cleanup_for_base (base_binfo, NULL_TREE);
rbase_init_list = TREE_CHAIN (rbase_init_list);
}
@@ -757,11 +745,14 @@ expand_virtual_init (binfo, decl)
/* If an exception is thrown in a constructor, those base classes already
constructed must be destroyed. This function creates the cleanup
- for BINFO, which has just been constructed. */
+ for BINFO, which has just been constructed. If FLAG is non-NULL,
+ it is a DECL which is non-zero when this base needs to be
+ destroyed. */
static void
-expand_cleanup_for_base (binfo)
+expand_cleanup_for_base (binfo, flag)
tree binfo;
+ tree flag;
{
tree expr;
@@ -771,7 +762,16 @@ expand_cleanup_for_base (binfo)
/* All cleanups must be on the function_obstack. */
push_obstacks_nochange ();
resume_temporary_allocation ();
- expr = build_partial_cleanup_for (binfo);
+
+ /* Call the destructor. */
+ expr = (build_scoped_method_call
+ (current_class_ref, binfo, dtor_identifier,
+ build_expr_list (NULL_TREE, integer_zero_node)));
+ if (flag)
+ expr = fold (build (COND_EXPR, void_type_node,
+ truthvalue_conversion (flag),
+ expr, integer_zero_node));
+
pop_obstacks ();
add_partial_entry (expr);
}
@@ -804,11 +804,12 @@ expand_aggr_vbase_init_1 (binfo, exp, ad
INIT_LIST is list of initialization for constructor to perform. */
static void
-expand_aggr_vbase_init (binfo, exp, addr, init_list)
+expand_aggr_vbase_init (binfo, exp, addr, init_list, flag)
tree binfo;
tree exp;
tree addr;
tree init_list;
+ tree flag;
{
tree type = BINFO_TYPE (binfo);
@@ -827,7 +828,7 @@ expand_aggr_vbase_init (binfo, exp, addr
expand_aggr_vbase_init_1 (vbases, exp,
TREE_OPERAND (TREE_VALUE (tmp), 0),
init_list);
- expand_cleanup_for_base (vbases);
+ expand_cleanup_for_base (vbases, flag);
}
}
}