procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

typeck.c (build_binary_op): Issue warning if either operand of a comparison operator is a string literal...

Browse source 
* typeck.c (build_binary_op): Issue warning if either operand of a
	comparison operator is a string literal, except for testing equality
	or inequality against NULL.

	* g++.dg/warn/Wstring-literal-comparison-1.C: New test case.
	* g++.dg/warn/Wstring-literal-comparison-2.C: Likewise.
	* g++.dg/warn/Wstring-literal-comparison-3.C: Likewise.
	* g++.dg/warn/Wstring-literal-comparison-4.C: Likewise.

From-SVN: r108120
This commit is contained in:
Roger Sayle 2005-12-06 14:05:58 +00:00 • committed by Roger Sayle
parent 9116d529f6
commit eda0cd9827
7 changed files with 138 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2005-12-06 Roger Sayle <roger@eyesopen.com>
* typeck.c (build_binary_op): Issue warning if either operand of a
comparison operator is a string literal, except for testing equality
or inequality against NULL.
2005-12-06 Roger Sayle <roger@eyesopen.com>
PR c++/25263

9
gcc/cp/typeck.c
View file

@ -3089,6 +3089,10 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
case NE_EXPR:
if (warn_float_equal && (code0 == REAL_TYPE || code1 == REAL_TYPE))
warning (0, "comparing floating point with == or != is unsafe");
if ((TREE_CODE (orig_op0) == STRING_CST && !integer_zerop (op1))
|| (TREE_CODE (orig_op1) == STRING_CST && !integer_zerop (op0)))
warning (OPT_Wstring_literal_comparison,
"comparison with string literal");
build_type = boolean_type_node;
if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE
@ -3194,6 +3198,11 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
case GE_EXPR:
case LT_EXPR:
case GT_EXPR:
if (TREE_CODE (orig_op0) == STRING_CST
|| TREE_CODE (orig_op1) == STRING_CST)
warning (OPT_Wstring_literal_comparison,
"comparison with string literal");
build_type = boolean_type_node;
if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE)
&& (code1 == INTEGER_TYPE || code1 == REAL_TYPE))

7
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2005-12-06 Roger Sayle <roger@eyesopen.com>
* g++.dg/warn/Wstring-literal-comparison-1.C: New test case.
* g++.dg/warn/Wstring-literal-comparison-2.C: Likewise.
* g++.dg/warn/Wstring-literal-comparison-3.C: Likewise.
* g++.dg/warn/Wstring-literal-comparison-4.C: Likewise.
2005-12-06 Roger Sayle <roger@eyesopen.com>
PR c++/25263

29
gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-1.C Normal file
View file

@ -0,0 +1,29 @@
/* PR c/7776 */
/* { dg-do compile } */
/* { dg-options "-Wstring-literal-comparison" } */
int test1(char *ptr)
{
return ptr == "foo"; /* { dg-warning "comparison with string" } */
}
int test2()
{
return "foo" != (const char*)0;
}
int test3()
{
return "foo" == (const char*)0;
}
int test4()
{
return (const char*)0 != "foo";
}
int test5()
{
return (const char*)0 == "foo";
}

29
gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-2.C Normal file
View file

@ -0,0 +1,29 @@
/* PR c/7776 */
/* { dg-do compile } */
/* { dg-options "-Wall" } */
int test1(char *ptr)
{
return ptr == "foo"; /* { dg-warning "comparison with string" } */
}
int test2()
{
return "foo" != (const char*)0;
}
int test3()
{
return "foo" == (const char*)0;
}
int test4()
{
return (const char*)0 != "foo";
}
int test5()
{
return (const char*)0 == "foo";
}

29
gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-3.C Normal file
View file

@ -0,0 +1,29 @@
/* PR c/7776 */
/* { dg-do compile } */
/* { dg-options "" } */
int test1(char *ptr)
{
return ptr == "foo";
}
int test2()
{
return "foo" != (const char*)0;
}
int test3()
{
return "foo" == (const char*)0;
}
int test4()
{
return (const char*)0 != "foo";
}
int test5()
{
return (const char*)0 == "foo";
}

29
gcc/testsuite/g++.dg/warn/Wstring-literal-comparison-4.C Normal file
View file

@ -0,0 +1,29 @@
/* PR c/7776 */
/* { dg-do compile } */
/* { dg-options "-Wall -Wno-string-literal-comparison" } */
int test1(char *ptr)
{
return ptr == "foo";
}
int test2()
{
return "foo" != (const char*)0;
}
int test3()
{
return "foo" == (const char*)0;
}
int test4()
{
return (const char*)0 != "foo";
}
int test5()
{
return (const char*)0 == "foo";
}