[gcc r14-4805] c: -Wint-conversion should cover pointer/integer mismatches in ?:

[gcc r14-4805] c: -Wint-conversion should cover pointer/integer mismatches in ?:

[Florian Weimer]

https://gcc.gnu.org/g:7069ea909f5292a17d22e5e68218373186820d29

commit r14-4805-g7069ea909f5292a17d22e5e68218373186820d29
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Oct 20 21:27:52 2023 +0200

    c: -Wint-conversion should cover pointer/integer mismatches in ?:
    
    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.

Diff:
---
 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 c73153c26b69..112d28fd656d 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 000000000000..4e514769c015
--- /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\\\]" } */
+}