]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
c: -Wint-conversion should cover pointer/integer mismatches in ?:
authorFlorian Weimer <fweimer@redhat.com>
Fri, 20 Oct 2023 19:27:52 +0000 (21:27 +0200)
committerFlorian Weimer <fweimer@redhat.com>
Fri, 20 Oct 2023 20:15:58 +0000 (22:15 +0200)
gcc/c/

PR c/109827
PR other/44209
* c-typeck.cc (build_conditional_expr): Use OPT_Wint_conversion
for pointer/integer mismatch warnings.

gcc/testsuite/

* gcc.dg/Wint-conversion-3.c: New.

gcc/c/c-typeck.cc
gcc/testsuite/gcc.dg/Wint-conversion-3.c [new file with mode: 0644]

index c73153c26b697d3f1c2b6efae7d07b8f33c1dbb3..112d28fd656d05bfb8a0af437ac7d6d2fd231a7f 100644 (file)
@@ -5580,7 +5580,7 @@ build_conditional_expr (location_t colon_loc, tree ifexp, bool ifexp_bcp,
           && (code2 == INTEGER_TYPE || code2 == BITINT_TYPE))
     {
       if (!null_pointer_constant_p (orig_op2))
-       pedwarn (colon_loc, 0,
+       pedwarn (colon_loc, OPT_Wint_conversion,
                 "pointer/integer type mismatch in conditional expression");
       else
        {
@@ -5592,7 +5592,7 @@ build_conditional_expr (location_t colon_loc, tree ifexp, bool ifexp_bcp,
           && (code1 == INTEGER_TYPE || code1 == BITINT_TYPE))
     {
       if (!null_pointer_constant_p (orig_op1))
-       pedwarn (colon_loc, 0,
+       pedwarn (colon_loc, OPT_Wint_conversion,
                 "pointer/integer type mismatch in conditional expression");
       else
        {
diff --git a/gcc/testsuite/gcc.dg/Wint-conversion-3.c b/gcc/testsuite/gcc.dg/Wint-conversion-3.c
new file mode 100644 (file)
index 0000000..4e51476
--- /dev/null
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+const char *
+f1 (int flag)
+{
+  return flag ? "" : 1; /* { dg-warning "pointer/integer type mismatch in conditional expression \\\[-Wint-conversion\\\]" } */
+}
+
+const char *
+f2 (int flag)
+{
+  return flag ? 1 : ""; /* { dg-warning "pointer/integer type mismatch in conditional expression \\\[-Wint-conversion\\\]" } */
+}