From 57910f3a9a81e9ad122a814255197f6f24c6af08 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sat, 3 Mar 2012 19:53:30 -0500
Subject: [PATCH] class.c (add_method): Always build an OVERLOAD for
using-decls.
* class.c (add_method): Always build an OVERLOAD for using-decls.
* search.c (lookup_member): Handle getting an OVERLOAD for a
single function.
From-SVN: r184873
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/class.c | 10 +++++++---
gcc/cp/search.c | 10 ++++++----
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6d73ea813e22..4674ba7b4395 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-03 Jason Merrill <jason@redhat.com>
+
+ * class.c (add_method): Always build an OVERLOAD for using-decls.
+ * search.c (lookup_member): Handle getting an OVERLOAD for a
+ single function.
+
2012-03-02 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51989
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 5d834d9ae5d4..6ed4cde6b51a 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -1117,9 +1117,13 @@ add_method (tree type, tree method, tree using_decl)
return false;
/* Add the new binding. */
- overload = build_overload (method, current_fns);
- if (using_decl && TREE_CODE (overload) == OVERLOAD)
- OVL_USED (overload) = true;
+ if (using_decl)
+ {
+ overload = ovl_cons (method, current_fns);
+ OVL_USED (overload) = true;
+ }
+ else
+ overload = build_overload (method, current_fns);
if (conv_p)
TYPE_HAS_CONVERSION (type) = 1;
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index e48dcec05890..a1f8a3db173a 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1250,10 +1250,12 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type,
only the first call to "f" is valid. However, if the function is
static, we can check. */
if (rval && protect
- && !really_overloaded_fn (rval)
- && !(TREE_CODE (rval) == FUNCTION_DECL
- && DECL_NONSTATIC_MEMBER_FUNCTION_P (rval)))
- perform_or_defer_access_check (basetype_path, rval, rval);
+ && !really_overloaded_fn (rval))
+ {
+ tree decl = is_overloaded_fn (rval) ? get_first_fn (rval) : rval;
+ if (!DECL_NONSTATIC_MEMBER_FUNCTION_P (decl))
+ perform_or_defer_access_check (basetype_path, decl, decl);
+ }
if (errstr && protect)
{
--
GitLab