From 2ed4c0297fb2ece975c69d17e02eac8d8b62325b Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Tue, 16 Jun 2015 15:29:09 -0400
Subject: [PATCH] re PR c++/58063 (default arguments evaluated twice per call)

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

From-SVN: r224533
---
 gcc/cp/ChangeLog                         |  3 +++
 gcc/cp/tree.c                            | 23 +++++++++++++++++++
 gcc/testsuite/g++.dg/overload/defarg10.C | 28 ++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/overload/defarg10.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1ab5e8f2c3f..5c85c5d1524 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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.
 
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 3553d7c2c9d..a52e6f4367f 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -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);
diff --git a/gcc/testsuite/g++.dg/overload/defarg10.C b/gcc/testsuite/g++.dg/overload/defarg10.C
new file mode 100644
index 00000000000..b8275d60453
--- /dev/null
+++ b/gcc/testsuite/g++.dg/overload/defarg10.C
@@ -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();
+}
-- 
2.30.2