From ec47ccca041a0d14973c5151914ce0930d55ff1c Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Tue, 21 Mar 2000 20:13:06 +0000 Subject: tree.c (mark_local_for_remap_p): Mark variables declared in TARGET_EXPRs as well. * tree.c (mark_local_for_remap_p): Mark variables declared in TARGET_EXPRs as well. From-SVN: r32675 --- gcc/cp/ChangeLog | 5 ++++ gcc/cp/tree.c | 24 ++++++++++------ gcc/testsuite/g++.old-deja/g++.other/dtor7.C | 42 ++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/g++.old-deja/g++.other/dtor7.C (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 79297e3..ed23164 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2000-03-21 Mark Mitchell + + * tree.c (mark_local_for_remap_p): Mark variables declared in + TARGET_EXPRs as well. + 2000-03-21 Nathan Sidwell * typeck.c (require_complete_type, complete_type, diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 84c7f3f..1409020 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2317,18 +2317,24 @@ mark_local_for_remap_r (tp, walk_subtrees, data) { tree t = *tp; splay_tree st = (splay_tree) data; + tree decl; - if ((TREE_CODE (t) == DECL_STMT - && nonstatic_local_decl_p (DECL_STMT_DECL (t))) - || TREE_CODE (t) == LABEL_STMT) + + if (TREE_CODE (t) == DECL_STMT + && nonstatic_local_decl_p (DECL_STMT_DECL (t))) + decl = DECL_STMT_DECL (t); + else if (TREE_CODE (t) == LABEL_STMT) + decl = LABEL_STMT_LABEL (t); + else if (TREE_CODE (t) == TARGET_EXPR + && nonstatic_local_decl_p (TREE_OPERAND (t, 0))) + decl = TREE_OPERAND (t, 0); + else + decl = NULL_TREE; + + if (decl) { - tree decl; tree copy; - /* Figure out what's being declared. */ - decl = (TREE_CODE (t) == DECL_STMT - ? DECL_STMT_DECL (t) : LABEL_STMT_LABEL (t)); - /* Make a copy. */ copy = copy_decl_for_inlining (decl, DECL_CONTEXT (decl), @@ -2344,7 +2350,7 @@ mark_local_for_remap_r (tp, walk_subtrees, data) } /* Called via walk_tree when an expression is unsaved. Using the - splay_tree pointed to by ST (which is really a `splay_tree *'), + splay_tree pointed to by ST (which is really a `splay_tree'), remaps all local declarations to appropriate replacements. */ static tree diff --git a/gcc/testsuite/g++.old-deja/g++.other/dtor7.C b/gcc/testsuite/g++.old-deja/g++.other/dtor7.C new file mode 100644 index 0000000..f1148af --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.other/dtor7.C @@ -0,0 +1,42 @@ +// Origin: Mark Mitchell +// Special g++ Options: -O2 + +int i; +int j; + +struct A +{ + A (); + A (const A&); + ~A (); +}; + +A::A () +{ + ++i; +} + +A::A (const A&) +{ + ++i; +} + +A::~A () +{ + --i; +} + +A f () +{ + return A (); +} + +void g (const A&) +{ +} + +int main () +{ + g (f ()); + return i; +} -- cgit v1.1