PR c++/77777 improve location for diagnostic

Pass in the location of the invalid expression, not the next input
location (which might be a comma or closing parenthesis on a different
line).

gcc/cp:

	PR c++/77777
	* call.c (resolve_args): Use location of expression, not current input
	location.

gcc/testsuite:

	PR c++/77777
	* g++.dg/diagnostic/pr77777.C: New test.

From-SVN: r260979

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cbec7d0..434fde6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-30  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR c++/77777
+       * call.c (resolve_args): Use location of expression, not current input
+       location.
+
 2018-05-30  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
        Do not warn about zero-as-null when NULL is used.

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 98319f9..d222b41 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4147,7 +4147,7 @@ resolve_args (vec<tree, va_gc> *args, tsubst_flags_t complain)
            error ("invalid use of void expression");
          return NULL;
        }
-      else if (invalid_nonstatic_memfn_p (input_location, arg, complain))
+      else if (invalid_nonstatic_memfn_p (arg->exp.locus, arg, complain))
        return NULL;
     }
   return args;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 338cbb2..af97797 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-30  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR c++/77777
+       * g++.dg/diagnostic/pr77777.C: New test.
+
 2018-05-30  David Pagan  <dave.pagan@oracle.com>
 
        PR c/55976

diff --git a/gcc/testsuite/g++.dg/diagnostic/pr77777.C b/gcc/testsuite/g++.dg/diagnostic/pr77777.C
new file mode 100644 (file)
index 0000000..0e7676d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/pr77777.C
@@ -0,0 +1,16 @@
+// PR c++/77777
+// { dg-do compile }
+
+struct X {
+  int f();
+};
+
+void g(int);
+
+int main()
+{
+  X x;
+  g(
+      x.f  // { dg-error "invalid use of non-static member function" }
+   );
+}