[PATCH] c: -Wint-conversion should cover pointer/integer mismatches in ?:

[Florian Weimer]

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                        |  4 ++--
 gcc/testsuite/gcc.dg/Wint-conversion-3.c | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 6e044b4afbc..7e18f95891a 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -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
index 00000000000..4e514769c01
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wint-conversion-3.c
@@ -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\\\]" } */
+}

base-commit: 8f4bbdc28df6e87a7ad5ec5ca191a7a836a4f016