summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-26 21:32:09 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-26 21:32:09 +0000
commit87778dc493bcdba0739525f9be23710cf27e4ada (patch)
tree087e3fcc98c0b9761edb88850ff86bd2947626ca
parent4e4baaad41b8e488b8070c2e3bed61d189767697 (diff)
downloadgcc-87778dc493bcdba0739525f9be23710cf27e4ada.tar.gz
PR c/64778
* c-typeck.c (convert_arguments): Return -1 if there are error_args, even if we've diagnosed too many arguments. * gcc.dg/pr64778.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220138 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/c/ChangeLog6
-rw-r--r--gcc/c/c-typeck.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/pr64778.c10
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 33cc2bd3a20..f361e7cb77f 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-26 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/64778
+ * c-typeck.c (convert_arguments): Return -1 if there are
+ error_args, even if we've diagnosed too many arguments.
+
2015-01-21 Richard Biener <rguenther@suse.de>
PR middle-end/64313
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index f39dfdd9aae..09b1bdf3893 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -3143,7 +3143,7 @@ convert_arguments (location_t loc, vec<location_t> arg_loc, tree typelist,
else
error_at (loc, "too many arguments to function %qE", function);
inform_declaration (fundecl);
- return parmnum;
+ return error_args ? -1 : (int) parmnum;
}
if (selector && argnum > 2)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 64162b05604..26d82acbf2e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2015-01-26 Jakub Jelinek <jakub@redhat.com>
+ PR c/64778
+ * gcc.dg/pr64778.c: New test.
+
+2015-01-26 Jakub Jelinek <jakub@redhat.com>
+
PR middle-end/64421
* gcc.dg/vect/pr64421.c: New test.
diff --git a/gcc/testsuite/gcc.dg/pr64778.c b/gcc/testsuite/gcc.dg/pr64778.c
new file mode 100644
index 00000000000..71a2607e79c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr64778.c
@@ -0,0 +1,10 @@
+/* PR c/64778 */
+/* { dg-do compile } */
+
+int
+foo (int p)
+{
+ int a;
+ a ^= foo (,); /* { dg-error "expected expression before|too many arguments" } */
+ return a;
+}