re PR c/17730 (Regression in diagnost message "invalid lvalue in unary %<&%>")

	PR c/17730
	* c-typeck.c (lvalue_or_else): Pass msgid directly to error.

testsuite:
	* gcc.dg/pr17730-1.c: New test

From-SVN: r88343

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 29486e3c98341cbc608e8a55e20277bb2388c987..4cdbe1b740712dae6906f5f2fe5a86b63431262a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+       PR c/17730
+       * c-typeck.c (lvalue_or_else): Pass msgid directly to error.
+
 2004-09-30  Diego Novillo  <dnovillo@redhat.com>
 
        * tree-ssa-alias.c (collect_points_to_info_r): Move analysis of

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index d744296aa13da5efb7810285ed7c1626afc27a70..1d79b232a0bd55309c5bd7426cb3d68828817c8c 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -2682,7 +2682,9 @@ lvalue_p (tree ref)
 }
 
 /* Return nonzero if REF is an lvalue valid for this language;
-   otherwise, print an error message and return zero.  */
+   otherwise, print an error message and return zero.  MSGID
+   is a format string which receives no arguments, but in which
+   formats such as %< and %> may occur.  */
 
 static int
 lvalue_or_else (tree ref, const char *msgid)
@@ -2690,7 +2692,7 @@ lvalue_or_else (tree ref, const char *msgid)
   int win = lvalue_p (ref);
 
   if (! win)
-    error ("%s", msgid);
+    error (msgid);
 
   return win;
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 13e29d9a153e8749f404418d51a1284acf020d18..819d4223cd363e22f6c1a11e795ea91efe70e8ee 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-30  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+       PR c/17730
+       * gcc.dg/pr17730-1.c: New test
+
 2004-09-29  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        PR c/7425

diff --git a/gcc/testsuite/gcc.dg/pr17730-1.c b/gcc/testsuite/gcc.dg/pr17730-1.c
new file mode 100644 (file)
index 0000000..0fede2f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr17730-1.c
@@ -0,0 +1,5 @@
+/* Test formatting of message for invalid lvalue.  Bug 17730.  */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+char *p = &'C'; /* { dg-error "error: invalid lvalue in unary '&'" } */