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.
This commit is contained in:
Florian Weimer 2023-10-20 21:27:52 +02:00
parent 857a6ee25f
commit 7069ea909f
2 changed files with 16 additions and 2 deletions

View 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
{

View File

@ -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\\\]" } */
}