OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/58063 (default arguments evaluated twice per call)

Browse Source 
PR c++/58063
	* tree.c (bot_manip): Remap SAVE_EXPR.

From-SVN: r224533
This commit is contained in:
Jason Merrill 2015-06-16 15:29:09 -04:00 committed by Jason Merrill
parent bd93aa1a97
commit 2ed4c0297f
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2015-06-16 Jason Merrill <jason@redhat.com>
PR c++/58063
* tree.c (bot_manip): Remap SAVE_EXPR.
PR c++/66387
* pt.c (tsubst_copy) [VAR_DECL]: Use process_outer_var_ref.

23
gcc/cp/tree.c
View File

@ -2423,6 +2423,29 @@ bot_manip (tree* tp, int* walk_subtrees, void* data)
*walk_subtrees = 0;
return NULL_TREE;
}
if (TREE_CODE (*tp) == SAVE_EXPR)
{
t = *tp;
splay_tree_node n = splay_tree_lookup (target_remap,
(splay_tree_key) t);
if (n)
{
*tp = (tree)n->value;
*walk_subtrees = 0;
}
else
{
copy_tree_r (tp, walk_subtrees, NULL);
splay_tree_insert (target_remap,
(splay_tree_key)t,
(splay_tree_value)*tp);
/* Make sure we don't remap an already-remapped SAVE_EXPR. */
splay_tree_insert (target_remap,
(splay_tree_key)*tp,
(splay_tree_value)*tp);
}
return NULL_TREE;
}
/* Make a copy of this node. */
t = copy_tree_r (tp, walk_subtrees, NULL);

28
gcc/testsuite/g++.dg/overload/defarg10.C Normal file
View File

@ -0,0 +1,28 @@
// PR c++/58063
// { dg-do run }
struct basic_ios
{
bool operator!() const { return false; }
};
struct ostream : virtual basic_ios
{
};
int i;
ostream& operator<<(ostream& os, const char* s) {
++i;
return os;
}
ostream cout;
void f(bool x = !(cout << "hi!\n")) { }
int main() {
f();
if (i != 1)
__builtin_abort();
}