From a10704e17a43ec70076c9c54f68f67dfca209c45 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Wed, 16 Dec 2015 17:34:27 +0000
Subject: [PATCH] C FE: fix range of primary-expression in
 c_parser_postfix_expression

gcc/c/ChangeLog:
	* c-parser.c (c_parser_postfix_expression): Use EXPR_LOC_OR_LOC
	to preserve range information for the primary expression
	in the call to c_parser_postfix_expression_after_primary.

gcc/testsuite/ChangeLog:
	* gcc.dg/cast-function-1.c (bar): Update column numbers.
	* gcc.dg/diagnostic-range-bad-called-object.c: New test case.

From-SVN: r231709
---
 gcc/c/ChangeLog                               |  6 +++++
 gcc/c/c-parser.c                              |  3 ++-
 gcc/testsuite/ChangeLog                       |  5 ++++
 gcc/testsuite/gcc.dg/cast-function-1.c        |  8 +++----
 .../diagnostic-range-bad-called-object.c      | 24 +++++++++++++++++++
 5 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/diagnostic-range-bad-called-object.c

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 3ed1326fd05..49c3cbb73dc 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-16  David Malcolm  <dmalcolm@redhat.com>
+
+	* c-parser.c (c_parser_postfix_expression): Use EXPR_LOC_OR_LOC
+	to preserve range information for the primary expression
+	in the call to c_parser_postfix_expression_after_primary.
+
 2015-12-16  David Malcolm  <dmalcolm@redhat.com>
 
 	* c-parser.c (c_parser_static_assert_declaration_no_semi): Use the
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 5c32f45e21e..e149e19bc2c 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -7954,7 +7954,8 @@ c_parser_postfix_expression (c_parser *parser)
       expr.value = error_mark_node;
       break;
     }
-  return c_parser_postfix_expression_after_primary (parser, loc, expr);
+  return c_parser_postfix_expression_after_primary
+    (parser, EXPR_LOC_OR_LOC (expr.value, loc), expr);
 }
 
 /* Parse a postfix expression after a parenthesized type name: the
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index adfb4e059a0..91ae32a5872 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-16  David Malcolm  <dmalcolm@redhat.com>
+
+	* gcc.dg/cast-function-1.c (bar): Update column numbers.
+	* gcc.dg/diagnostic-range-bad-called-object.c: New test case.
+
 2015-12-16  David Malcolm  <dmalcolm@redhat.com>
 
 	* gcc.dg/diagnostic-range-static-assert.c: New test case.
diff --git a/gcc/testsuite/gcc.dg/cast-function-1.c b/gcc/testsuite/gcc.dg/cast-function-1.c
index ab42db1196c..5228b559165 100644
--- a/gcc/testsuite/gcc.dg/cast-function-1.c
+++ b/gcc/testsuite/gcc.dg/cast-function-1.c
@@ -18,14 +18,14 @@ typedef struct {
 
 void bar(double d, int i, str_t s)
 {
-  d = ((double (*) (int)) foo1) (i);  /* { dg-warning "7:non-compatible|abort" } */
-  i = ((int (*) (double)) foo1) (d);  /* { dg-warning "7:non-compatible|abort" } */
-  s = ((str_t (*) (int)) foo1) (i);   /* { dg-warning "7:non-compatible|abort" } */
+  d = ((double (*) (int)) foo1) (i);  /* { dg-warning "8:non-compatible|abort" } */
+  i = ((int (*) (double)) foo1) (d);  /* { dg-warning "8:non-compatible|abort" } */
+  s = ((str_t (*) (int)) foo1) (i);   /* { dg-warning "8:non-compatible|abort" } */
   ((void (*) (int)) foo1) (d);        /* { dg-warning "non-compatible|abort" } */
   i = ((int (*) (int)) foo1) (i);     /* { dg-bogus "non-compatible|abort" } */
   (void) foo1 (i);                    /* { dg-bogus "non-compatible|abort" } */
 
-  d = ((double (*) (int)) foo2) (i);  /* { dg-warning "7:non-compatible|abort" } */
+  d = ((double (*) (int)) foo2) (i);  /* { dg-warning "8:non-compatible|abort" } */
   i = ((int (*) (double)) foo2) (d);  /* { dg-bogus "non-compatible|abort" } */
   s = ((str_t (*) (int)) foo2) (i);   /* { dg-warning "non-compatible|abort" } */
   ((void (*) (int)) foo2) (d);        /* { dg-warning "non-compatible|abort" } */
diff --git a/gcc/testsuite/gcc.dg/diagnostic-range-bad-called-object.c b/gcc/testsuite/gcc.dg/diagnostic-range-bad-called-object.c
new file mode 100644
index 00000000000..95fb3e9ec5a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/diagnostic-range-bad-called-object.c
@@ -0,0 +1,24 @@
+/* { dg-options "-fdiagnostics-show-caret" } */
+
+/* Adapted from https://gcc.gnu.org/wiki/ClangDiagnosticsComparison */
+
+void call_of_non_function_ptr (char **argP, char **argQ)
+{
+  (argP - argQ)(); /* { dg-error "called object is not a function or function pointer" } */
+
+/* { dg-begin-multiline-output "" }
+   (argP - argQ)();
+   ~~~~~~^~~~~~~
+   { dg-end-multiline-output "" } */
+
+  argP();       /* { dg-error "called object 'argP' is not a function or function pointer" } */
+
+/* { dg-begin-multiline-output "" }
+   argP();
+   ^~~~
+   { dg-end-multiline-output "" }
+   { dg-begin-multiline-output "" }
+ void call_of_non_function_ptr (char **argP, char **argQ)
+                                       ^~~~
+   { dg-end-multiline-output "" } */
+}