re PR c/90628 (__builtin_mul_overflow writes to const qualified integer)

	PR c/90628
	* c-common.c (check_builtin_function_arguments)
	<case BUILTIN_*_OVERFLOW>: Diagnose pointer to const qualified integer
	as last argument.

	* c-c++-common/builtin-arith-overflow-3.c: New test.

From-SVN: r271732

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 328effd24db85f0fa008afa39ca882454c477772..0c3a64407a05a2ceed48cc7037b85dea5fbcf3c7 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-29  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/90628
+       * c-common.c (check_builtin_function_arguments)
+       <case BUILTIN_*_OVERFLOW>: Diagnose pointer to const qualified integer
+       as last argument.
+
 2019-05-23  Eric Botcazou  <ebotcazou@adacore.com>
 
        * c-ada-spec.c (compare_node): Compare the DECL_UIDs as a last resort.

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 10ae91e427ffd9375bf1f2b18ea6c3bdf6f5a7a5..4057be3aaed2692687744d3058e3a60c27344953 100644 (file)
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -5995,6 +5995,13 @@ check_builtin_function_arguments (location_t loc, vec<location_t> arg_loc,
                        "has pointer to boolean type", fndecl);
              return false;
            }
+         else if (TYPE_READONLY (TREE_TYPE (TREE_TYPE (args[2]))))
+           {
+             error_at (ARG_LOCATION (2), "argument 3 in call to function %qE "
+                       "has pointer to %<const%> type (%qT)", fndecl,
+                       TREE_TYPE (args[2]));
+             return false;
+           }
          return true;
        }
       return false;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7149cdf6fa5bb86165b2cdfd9d0f85948c6fb747..9ca22fb61ea51aa421f2e75bb905d049ec0439fa 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-05-29  Jakub Jelinek  <jakub@redhat.com>
 
+       PR c/90628
+       * c-c++-common/builtin-arith-overflow-3.c: New test.
+
        P1091R3 - Extending structured bindings to be more like var decls
        P1381R1 - Reference capture of structured bindings
        * g++.dg/cpp1z/decomp3.C (test): For static, expect only warning

diff --git a/gcc/testsuite/c-c++-common/builtin-arith-overflow-3.c b/gcc/testsuite/c-c++-common/builtin-arith-overflow-3.c
new file mode 100644 (file)
index 0000000..37a2259
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/builtin-arith-overflow-3.c
@@ -0,0 +1,42 @@
+/* PR c/90628 */
+/* { dg-do compile } */
+
+const int a = 1, b = 2, c = 3;
+const long d = 4, e = 5, f = 6;
+const long long g = 7, h = 8, i = 9;
+
+void
+f1 ()
+{
+  __builtin_add_overflow (a, b, &c);   /* { dg-error "argument 3 in call to function '__builtin_add_overflow' has pointer to 'const' type" } */
+}
+
+void
+f2 ()
+{
+  __builtin_sub_overflow (d, e, &f);   /* { dg-error "argument 3 in call to function '__builtin_sub_overflow' has pointer to 'const' type" } */
+}
+
+void
+f3 ()
+{
+  __builtin_mul_overflow (g, h, &i);   /* { dg-error "argument 3 in call to function '__builtin_mul_overflow' has pointer to 'const' type" } */
+}
+
+void
+f4 ()
+{
+  __builtin_sadd_overflow (a, b, &c);  /* { dg-warning "passing argument 3 of '__builtin_sadd_overflow' discards 'const' qualifier from pointer target type" "" { target c } } */
+}      /* { dg-error "invalid conversion from 'const int\\*' to 'int\\*'" "" { target c++ } .-1 } */
+
+void
+f5 ()
+{
+  __builtin_ssubl_overflow (d, e, &f); /* { dg-warning "passing argument 3 of '__builtin_ssubl_overflow' discards 'const' qualifier from pointer target type" "" { target c } } */
+}      /* { dg-error "invalid conversion from 'const long int\\*' to 'long int\\*'" "" { target c++ } .-1 } */
+
+void
+f6 ()
+{
+  __builtin_smulll_overflow (g, h, &i);        /* { dg-warning "passing argument 3 of '__builtin_smulll_overflow' discards 'const' qualifier from pointer target type" "" { target c } } */
+}      /* { dg-error "invalid conversion from 'const long long int\\*' to 'long long int\\*'" "" { target c++ } .-1 } */