2016-02-10 Jason Merrill <jason@redhat.com>
+ PR c++/69657
+ * name-lookup.c (ambiguous_decl): Call remove_hidden_names.
+ (lookup_name_real_1): Likewise.
+ (remove_hidden_names): Handle non-functions too.
+
PR c++/10200
* parser.c (cp_parser_lookup_name): When looking for a template
after . or ->, only consider class templates.
val = new_binding->value;
if (val)
{
- if (hidden_name_p (val) && !(flags & LOOKUP_HIDDEN))
- val = NULL_TREE;
- else
+ if (!(flags & LOOKUP_HIDDEN))
+ val = remove_hidden_names (val);
+ if (val)
switch (TREE_CODE (val))
{
case TEMPLATE_DECL:
return false;
}
-/* Remove any hidden friend functions from a possibly overloaded set
+/* Remove any hidden declarations from a possibly overloaded set
of functions. */
tree
if (!fns)
return fns;
- if (TREE_CODE (fns) == FUNCTION_DECL && hidden_name_p (fns))
+ if (DECL_P (fns) && hidden_name_p (fns))
fns = NULL_TREE;
else if (TREE_CODE (fns) == OVERLOAD)
{
if (!val)
val = unqualified_namespace_lookup (name, flags);
+ /* Anticipated built-ins and friends aren't found by normal lookup. */
+ if (val && !(flags & LOOKUP_HIDDEN))
+ val = remove_hidden_names (val);
+
/* If we have a single function from a using decl, pull it out. */
if (val && TREE_CODE (val) == OVERLOAD && !really_overloaded_fn (val))
val = OVL_FUNCTION (val);
--- /dev/null
+// PR c++/69657
+
+typedef unsigned int size_t;
+namespace std {
+extern void *calloc(size_t, size_t);
+}
+using std::calloc;
+int
+main ()
+{
+ char *(*pfn) = (char *(*)) calloc ;
+ (bool)&calloc;
+ (bool)&::calloc;
+}