re PR c++/48481 (C++ overloading memory hog)

	PR c++/48481
	* cp-tree.h (OVL_ARG_DEPENDENT): New.
	* name-lookup.c (add_function): Set it.
	* semantics.c (finish_call_expr): Free OVERLOADs if it's set.

From-SVN: r172163

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2cb394f00e6105b180a806c1247aa4ad4e2f13b6..307272bef42b423ee00a5a87f29af72d575bf0a1 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2011-04-07  Jason Merrill  <jason@redhat.com>
 
+       PR c++/48481
+       * cp-tree.h (OVL_ARG_DEPENDENT): New.
+       * name-lookup.c (add_function): Set it.
+       * semantics.c (finish_call_expr): Free OVERLOADs if it's set.
+
        PR c++/48481
        * call.c (build_user_type_conversion_1): Use lookup_fnfields_slot.
        Release unused vector.

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index ea251a8dbbd050e2e1c2c096968010f60d0c7eeb..885b31cd61ae568690b3471860e43f7b9bacb1f7 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -317,6 +317,9 @@ typedef struct ptrmem_cst * ptrmem_cst_t;
    This is not to confuse with being used somewhere, which
    is not important for this node.  */
 #define OVL_USED(NODE)         TREE_USED (NODE)
+/* If set, this OVERLOAD was created for argument-dependent lookup
+   and can be freed afterward.  */
+#define OVL_ARG_DEPENDENT(NODE) TREE_LANG_FLAG_0 (OVERLOAD_CHECK (NODE))
 
 struct GTY(()) tree_overload {
   struct tree_common common;

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 18e34417b26e2756f0679e34399ee2a65bf8d652..696a8f5fdcbae56f911e17aa40b7db158f606485 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -4725,7 +4725,11 @@ add_function (struct arg_lookup *k, tree fn)
   else if (fn == k->functions)
     ;
   else
-    k->functions = build_overload (fn, k->functions);
+    {
+      k->functions = build_overload (fn, k->functions);
+      if (TREE_CODE (k->functions) == OVERLOAD)
+       OVL_ARG_DEPENDENT (k->functions) = true;
+    }
 
   return false;
 }

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 30175afaaa5fa26647b491ae88cc16778101022c..2184a53558e4a957ed2e10f63b2e9439451df389 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2160,6 +2160,25 @@ finish_call_expr (tree fn, VEC(tree,gc) **args, bool disallow_virtual,
       result = convert_from_reference (result);
     }
 
+  if (koenig_p)
+    {
+      /* Free garbage OVERLOADs from arg-dependent lookup.  */
+      tree next = NULL_TREE;
+      for (fn = orig_fn;
+          fn && TREE_CODE (fn) == OVERLOAD && OVL_ARG_DEPENDENT (fn);
+          fn = next)
+       {
+         if (processing_template_decl)
+           /* In a template, we'll re-use them at instantiation time.  */
+           OVL_ARG_DEPENDENT (fn) = false;
+         else
+           {
+             next = OVL_CHAIN (fn);
+             ggc_free (fn);
+           }
+       }
+    }
+
   return result;
 }