mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 18:41:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

85th Cygnus<->FSF quick merge

Browse Source 
From-SVN: r11505
This commit is contained in:
Mike Stump 1996-03-09 19:44:47 +00:00 committed by Mike Stump
parent 2a888d4cd0
commit 934c6b1387
3 changed files with 37 additions and 9 deletions

15
gcc/cp/ChangeLog

@ -1,3 +1,18 @@
Fri Mar 8 11:47:26 1996 Mike Stump <mrs@cygnus.com>
* tree.c (unsave_expr): Don't unsave, UNSAVE_EXPRs.
Fri Mar 8 11:29:06 1996 Mike Stump <mrs@cygnus.com>
* decl.c (cp_finish_decl): The exception regions have to be
nested, not overlapping. We start the exception region for a
decl, after it has been fully built, and all temporaries for it
have been cleaned up.
Thu Mar 7 17:46:06 1996 Mike Stump <mrs@cygnus.com>
* tree.c (vec_binfo_member): Don't core dump if we have no bases.
Thu Mar 7 14:11:49 1996 Jason Merrill <jason@yorick.cygnus.com>
* tree.def: Add RETURN_INIT.

13
gcc/cp/decl.c

@ -6769,7 +6769,15 @@ cp_finish_decl (decl, init, asmspec_tree, need_pop, flags)
&& cleanup == NULL_TREE
&& DECL_NAME (decl))
TREE_USED (decl) = 0;
}
/* Cleanup any temporaries needed for the initial value. */
expand_cleanups_to (old_cleanups);
pop_temp_slots ();
pop_temp_slots ();
target_temp_slot_level = old_temp_level;
if (DECL_SIZE (decl) && type != error_mark_node)
{
/* Store the cleanup, if there was one. */
if (cleanup)
{
@ -6778,11 +6786,6 @@ cp_finish_decl (decl, init, asmspec_tree, need_pop, flags)
decl);
}
}
/* Cleanup any temporaries needed for the initial value. */
expand_cleanups_to (old_cleanups);
pop_temp_slots ();
pop_temp_slots ();
target_temp_slot_level = old_temp_level;
}
finish_end0:

18
gcc/cp/tree.c

@ -1761,12 +1761,19 @@ break_out_target_exprs (t)
return mapcar (t, bot_manip);
}
/* Arrange for an expression to be expanded multiple independent
times. This is useful for cleanup actions, as the backend can
expand them multiple times in different places. */
tree
unsave_expr (expr)
tree expr;
{
tree t;
/* If this is already protected, no sense in protecting it again. */
if (TREE_CODE (expr) == UNSAVE_EXPR)
return expr;
t = build1 (UNSAVE_EXPR, TREE_TYPE (expr), expr);
TREE_SIDE_EFFECTS (t) = TREE_SIDE_EFFECTS (expr);
return t;
@ -1984,16 +1991,19 @@ can_free (obstack, t)
}
/* Return first vector element whose BINFO_TYPE is ELEM.
Return 0 if ELEM is not in VEC. */
Return 0 if ELEM is not in VEC. VEC may be NULL_TREE. */
tree
vec_binfo_member (elem, vec)
tree elem, vec;
{
int i;
for (i = 0; i < TREE_VEC_LENGTH (vec); ++i)
if (elem == BINFO_TYPE (TREE_VEC_ELT (vec, i)))
return TREE_VEC_ELT (vec, i);
if (vec)
for (i = 0; i < TREE_VEC_LENGTH (vec); ++i)
if (elem == BINFO_TYPE (TREE_VEC_ELT (vec, i)))
return TREE_VEC_ELT (vec, i);
return NULL_TREE;
}