commit 5509a56f6699e727a27a8010a566027cb41191f7
Author: Jason Merrill <jason@redhat.com>
Date: Mon Aug 8 10:56:49 2011 -0400
PR c++/50020
* semantics.c (finish_call_expr): Don't look at 'this' if we
had an explicit object argument.
@@ -2042,12 +2042,14 @@ finish_call_expr (tree fn, VEC(tree,gc) **args, bool disallow_virtual,
expressions with no type as being dependent. */
if (type_dependent_expression_p (fn)
|| any_type_dependent_arguments_p (*args)
- /* For a non-static member function, we need to specifically
+ /* For a non-static member function that doesn't have an
+ explicit object argument, we need to specifically
test the type dependency of the "this" pointer because it
is not included in *ARGS even though it is considered to
be part of the list of arguments. Note that this is
related to CWG issues 515 and 1005. */
- || (non_static_member_function_p (fn)
+ || (TREE_CODE (fn) != COMPONENT_REF
+ && non_static_member_function_p (fn)
&& current_class_ref
&& type_dependent_expression_p (current_class_ref)))
{
@@ -1,4 +1,5 @@
// PR c++/49834
+// PR c++/50020
// { dg-options -std=c++0x }
struct A
@@ -17,16 +18,19 @@ struct C
};
template <typename Ret>
-Ret f(const C &p)
+struct D
{
- for (const B &i: p) // OK
- i.second.get_value<int>();
- for (const auto &i: p) // ERROR
- i.second.get_value<int>();
- return Ret(0);
-}
+ Ret f(const C &p)
+ {
+ for (const B &i: p) // OK
+ i.second.get_value<int>();
+ for (const auto &i: p) // ERROR
+ i.second.get_value<int>();
+ return Ret(0);
+ }
+};
void g()
{
- f<int>(C());
+ D<int>().f(C());
}