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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e5f98293c3253a4a15e05c8d57ab66749062d23b..0adbc3f93c6321ab98c306416df613065b47f678 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6af774fc0fd267f373d611a43890cd9c5042a7c4..4a1267c9367db9ae5d4c10007df682d5ce4865fb 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -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);