c++: Fix ICE diagnosing incomplete type of overloaded function set [PR98356]
In the linked PR the result of 'get_first_fn' is a USING_DECL against the template parameter, to be filled in on instantiation. But we don't actually need to get the first set of the member functions: it's enough to know that we have a (possibly overloaded) member function at all. PR c++/98356 gcc/cp/ChangeLog: * typeck2.cc (cxx_incomplete_type_diagnostic): Don't assume 'member' will be a FUNCTION_DECL (or something like it). gcc/testsuite/ChangeLog: * g++.dg/pr98356.C: New test. Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
This commit is contained in:
parent
77772f8a3d
commit
940586a635
2 changed files with 14 additions and 6 deletions
|
@ -350,16 +350,15 @@ cxx_incomplete_type_diagnostic (location_t loc, const_tree value,
|
||||||
bad_member:
|
bad_member:
|
||||||
{
|
{
|
||||||
tree member = TREE_OPERAND (value, 1);
|
tree member = TREE_OPERAND (value, 1);
|
||||||
if (is_overloaded_fn (member))
|
if (is_overloaded_fn (member) && !flag_ms_extensions)
|
||||||
member = get_first_fn (member);
|
|
||||||
|
|
||||||
if (DECL_FUNCTION_MEMBER_P (member)
|
|
||||||
&& ! flag_ms_extensions)
|
|
||||||
{
|
{
|
||||||
gcc_rich_location richloc (loc);
|
gcc_rich_location richloc (loc);
|
||||||
/* If "member" has no arguments (other than "this"), then
|
/* If "member" has no arguments (other than "this"), then
|
||||||
add a fix-it hint. */
|
add a fix-it hint. */
|
||||||
if (type_num_arguments (TREE_TYPE (member)) == 1)
|
member = MAYBE_BASELINK_FUNCTIONS (member);
|
||||||
|
if (TREE_CODE (member) == FUNCTION_DECL
|
||||||
|
&& DECL_OBJECT_MEMBER_FUNCTION_P (member)
|
||||||
|
&& type_num_arguments (TREE_TYPE (member)) == 1)
|
||||||
richloc.add_fixit_insert_after ("()");
|
richloc.add_fixit_insert_after ("()");
|
||||||
complained = emit_diagnostic (diag_kind, &richloc, 0,
|
complained = emit_diagnostic (diag_kind, &richloc, 0,
|
||||||
"invalid use of member function %qD "
|
"invalid use of member function %qD "
|
||||||
|
|
9
gcc/testsuite/g++.dg/pr98356.C
Normal file
9
gcc/testsuite/g++.dg/pr98356.C
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
// PR c++/98356
|
||||||
|
// { dg-do compile { target c++11 } }
|
||||||
|
|
||||||
|
template <template <typename> class T> struct S {
|
||||||
|
using A = T<int>;
|
||||||
|
using A::foo;
|
||||||
|
void foo ();
|
||||||
|
void bar () {foo.} // { dg-error "invalid use of member function" }
|
||||||
|
};
|
Loading…
Add table
Reference in a new issue