From ca1085f03cc717057e7831e1ca0b98fc44c78eb8 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 30 Jun 2011 17:10:03 -0400 Subject: [PATCH] re PR c++/48481 (C++ overloading memory hog) PR c++/48481 * name-lookup.c (struct arg_lookup): Add fn_set. (add_function): Check it. (lookup_arg_dependent_1): Initialize it. From-SVN: r175732 --- gcc/cp/ChangeLog | 7 +++++ gcc/cp/name-lookup.c | 30 ++++++++++++++++----- gcc/testsuite/g++.dg/template/crash37.C | 5 ++-- gcc/testsuite/g++.dg/template/ptrmem4.C | 3 +-- gcc/testsuite/g++.old-deja/g++.other/pmf3.C | 5 ++-- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e95e7c8f082..42c21fe2150 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2011-06-30 Jason Merrill + + PR c++/48481 + * name-lookup.c (struct arg_lookup): Add fn_set. + (add_function): Check it. + (lookup_arg_dependent_1): Initialize it. + 2011-06-29 Jason Merrill PR c++/49216 diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 8bf5f5fde66..615e177e1f1 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see #include "debug.h" #include "c-family/c-pragma.h" #include "params.h" +#include "pointer-set.h" /* The bindings for a particular name in a particular scope. */ @@ -4864,6 +4865,7 @@ struct arg_lookup VEC(tree,gc) *namespaces; VEC(tree,gc) *classes; tree functions; + struct pointer_set_t *fn_set; }; static bool arg_assoc (struct arg_lookup*, tree); @@ -4883,16 +4885,11 @@ static bool arg_assoc_template_arg (struct arg_lookup*, tree); static bool add_function (struct arg_lookup *k, tree fn) { - /* We used to check here to see if the function was already in the list, - but that's O(n^2), which is just too expensive for function lookup. - Now we deal with the occasional duplicate in joust. In doing this, we - assume that the number of duplicates will be small compared to the - total number of functions being compared, which should usually be the - case. */ - if (!is_overloaded_fn (fn)) /* All names except those of (possibly overloaded) functions and function templates are ignored. */; + else if (k->fn_set && pointer_set_insert (k->fn_set, fn)) + /* It's already in the list. */; else if (!k->functions) k->functions = fn; else if (fn == k->functions) @@ -5346,6 +5343,23 @@ lookup_arg_dependent_1 (tree name, tree fns, VEC(tree,gc) *args, picking up later definitions) in the second stage. */ k.namespaces = make_tree_vector (); + /* We used to allow duplicates and let joust discard them, but + since the above change for DR 164 we end up with duplicates of + all the functions found by unqualified lookup. So keep track + of which ones we've seen. */ + if (fns) + { + tree ovl; + /* We shouldn't be here if lookup found something other than + namespace-scope functions. */ + gcc_assert (DECL_NAMESPACE_SCOPE_P (OVL_CURRENT (fns))); + k.fn_set = pointer_set_create (); + for (ovl = fns; ovl; ovl = OVL_NEXT (ovl)) + pointer_set_insert (k.fn_set, OVL_CURRENT (ovl)); + } + else + k.fn_set = NULL; + if (include_std) arg_assoc_namespace (&k, std_node); arg_assoc_args_vec (&k, args); @@ -5363,6 +5377,8 @@ lookup_arg_dependent_1 (tree name, tree fns, VEC(tree,gc) *args, release_tree_vector (k.classes); release_tree_vector (k.namespaces); + if (k.fn_set) + pointer_set_destroy (k.fn_set); return fns; } diff --git a/gcc/testsuite/g++.dg/template/crash37.C b/gcc/testsuite/g++.dg/template/crash37.C index 60724231eab..d5167c8d2dc 100644 --- a/gcc/testsuite/g++.dg/template/crash37.C +++ b/gcc/testsuite/g++.dg/template/crash37.C @@ -11,7 +11,7 @@ struct coperator_stack struct helper {}; template -void bla(F f) // { dg-message "bla|no known conversion" } +void bla(F f) { } @@ -20,8 +20,7 @@ struct definition { definition() { - bla(coperator_stack::push3); // { dg-error "matching" } - // { dg-message "candidate" "candidate note" { target *-*-* } 23 } + bla(coperator_stack::push3); // { dg-error "pointer to member" } } }; diff --git a/gcc/testsuite/g++.dg/template/ptrmem4.C b/gcc/testsuite/g++.dg/template/ptrmem4.C index 62262c4b8e9..14f36d4e386 100644 --- a/gcc/testsuite/g++.dg/template/ptrmem4.C +++ b/gcc/testsuite/g++.dg/template/ptrmem4.C @@ -16,6 +16,5 @@ struct SpyExample void SpyExample::ready() { - queryAliases(inputs); // { dg-error "matching" } - // { dg-message "candidate" "candidate note" { target *-*-* } 19 } + queryAliases(inputs); // { dg-error "matching|unresolved" } } diff --git a/gcc/testsuite/g++.old-deja/g++.other/pmf3.C b/gcc/testsuite/g++.old-deja/g++.other/pmf3.C index 11e648ed86e..448d7914571 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/pmf3.C +++ b/gcc/testsuite/g++.old-deja/g++.other/pmf3.C @@ -3,7 +3,7 @@ // Bug: g++ was crashing after giving errors. template - void connect_to_method( // { dg-message "connect_to_method|no known conversion" } + void connect_to_method( T *receiver, void (T::*method)()) {} @@ -20,7 +20,6 @@ public: Gtk_Base::Gtk_Base() { - connect_to_method(this,&show); // { dg-error "no match" } invalid pmf expression - // { dg-message "candidate" "candidate note" { target *-*-* } 23 } + connect_to_method(this,&show); // { dg-error "pointer to member" } invalid pmf expression connect_to_method(this,&expose); // { dg-error "pointer to member" } invalid pmf expression } -- 2.30.2