decl.c (cp_finish_decomp): Don't adjust eltscnt when calling inform_n.

* decl.c (cp_finish_decomp): Don't adjust eltscnt when calling
	inform_n.

From-SVN: r258058
This commit is contained in:
Jakub Jelinek 2018-02-28 10:01:13 +01:00 committed by Jakub Jelinek
parent ce579a4fe0
commit c1299a9e28
2 changed files with 6 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2018-02-28 Jakub Jelinek <jakub@redhat.com>
* decl.c (cp_finish_decomp): Don't adjust eltscnt when calling
inform_n.
2018-02-27 Martin Sebor <msebor@redhat.com>
* pt.c: Avoid including <string> directly.

View File

@ -7535,10 +7535,7 @@ cp_finish_decomp (tree decl, tree first, unsigned int count)
error_n (loc, count,
"only %u name provided for structured binding",
"only %u names provided for structured binding", count);
/* Some languages have special plural rules even for large values,
but it is periodic with period of 10, 100, 1000 etc. */
inform_n (loc, eltscnt > INT_MAX
? (eltscnt % 1000000) + 1000000 : eltscnt,
inform_n (loc, eltscnt,
"while %qT decomposes into %wu element",
"while %qT decomposes into %wu elements",
type, eltscnt);