PR tree-optimization/84818 - integer_onep must not be used for i18n

gcc/ChangeLog:

	PR tree-optimization/84818
	* builtins.c (check_access): Use warning_n.

From-SVN: r258983

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9114947a763e0d245f58d2647808ebbf0337bf6f..b9f56ad1eab40913037f89729ab09b07f5536de4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-30  Martin Sebor  <msebor@redhat.com>
+
+       PR tree-optimization/84818
+       * builtins.c (check_access): Use warning_n.
+
 2018-03-30  Aaron Sawdey  <acsawdey@linux.vnet.ibm.com>
 
        PR target/83822

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 487d9d58db2354958420e23308b5d5c3fd03da35..0c560182f72500d53cbc54c98efe24854d2068af 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3172,13 +3172,12 @@ check_access (tree exp, tree, tree, tree dstwrite,
                          exp, func, range[0], dstsize);
            }
          else if (tree_int_cst_equal (range[0], range[1]))
-           warning_at (loc, opt,
-                       (integer_onep (range[0])
-                        ? G_("%K%qD writing %E byte into a region "
-                             "of size %E overflows the destination")
-                        : G_("%K%qD writing %E bytes into a region "
-                             "of size %E overflows the destination")),
-                       exp, func, range[0], dstsize);
+           warning_n (loc, opt, tree_to_uhwi (range[0]),
+                      "%K%qD writing %E byte into a region "
+                      "of size %E overflows the destination",
+                      "%K%qD writing %E bytes into a region "
+                      "of size %E overflows the destination",
+                      exp, func, range[0], dstsize);
          else if (tree_int_cst_sign_bit (range[1]))
            {
              /* Avoid printing the upper bound if it's invalid.  */
@@ -3273,10 +3272,9 @@ check_access (tree exp, tree, tree, tree dstwrite,
       location_t loc = tree_nonartificial_location (exp);
 
       if (tree_int_cst_equal (range[0], range[1]))
-       warning_at (loc, opt,
-                   (tree_int_cst_equal (range[0], integer_one_node)
-                    ? G_("%K%qD reading %E byte from a region of size %E")
-                    : G_("%K%qD reading %E bytes from a region of size %E")),
+       warning_n (loc, opt, tree_to_uhwi (range[0]),
+                  "%K%qD reading %E byte from a region of size %E",
+                  "%K%qD reading %E bytes from a region of size %E",
                    exp, func, range[0], slen);
       else if (tree_int_cst_sign_bit (range[1]))
        {