OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c/64423 (Incorrect column number of -Wchar-subscripts)

Browse Source 
PR c/64423
c-family/
	* c-common.c (warn_array_subscript_with_type_char): Add location_t
	parameter.  Use it.
	* c-common.h (warn_array_subscript_with_type_char): Update
	declaration.
c/
	* c-typeck.c (build_array_ref): Pass loc down to
	warn_array_subscript_with_type_char.
cp/
	* typeck.c (cp_build_array_ref): Pass loc down to
	warn_array_subscript_with_type_char.
testsuite/
	* gcc.dg/pr64423.c: New test.

From-SVN: r219186
This commit is contained in:
Marek Polacek 2015-01-05 12:03:57 +00:00 committed by Marek Polacek
parent 2c5103ffdd
commit 5bd012f83b
9 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/c-family/ChangeLog
View File

@ -1,3 +1,11 @@
2015-01-05 Marek Polacek <polacek@redhat.com>
PR c/64423
* c-common.c (warn_array_subscript_with_type_char): Add location_t
parameter. Use it.
* c-common.h (warn_array_subscript_with_type_char): Update
declaration.
2014-12-20 Edward Smith-Rowland <3dw4rd@verizon.net>
* c-cppbuiltin.c (__cpp_sized_deallocation): Uncomment and move macro.

5
gcc/c-family/c-common.c
View File

@ -11238,11 +11238,12 @@ check_missing_format_attribute (tree ltype, tree rtype)
warning only for non-constant value of type char. */
void
warn_array_subscript_with_type_char (tree index)
warn_array_subscript_with_type_char (location_t loc, tree index)
{
if (TYPE_MAIN_VARIANT (TREE_TYPE (index)) == char_type_node
&& TREE_CODE (index) != INTEGER_CST)
warning (OPT_Wchar_subscripts, "array subscript has type %<char%>");
warning_at (loc, OPT_Wchar_subscripts,
"array subscript has type %<char%>");
}
/* Implement -Wparentheses for the unexpected C precedence rules, to

2
gcc/c-family/c-common.h
View File

@ -1014,7 +1014,7 @@ extern tree builtin_type_for_size (int, bool);
extern void c_common_mark_addressable_vec (tree);
extern void warn_array_subscript_with_type_char (tree);
extern void warn_array_subscript_with_type_char (location_t, tree);
extern void warn_about_parentheses (location_t,
enum tree_code,
enum tree_code, tree,

6
gcc/c/ChangeLog
View File

@ -1,3 +1,9 @@
2015-01-05 Marek Polacek <polacek@redhat.com>
PR c/64423
* c-typeck.c (build_array_ref): Pass loc down to
warn_array_subscript_with_type_char.
2014-12-20 Martin Uecker <uecker@eecs.berkeley.edu>
* c-typeck.c: New behavious for pointers to arrays with qualifiers

2
gcc/c/c-typeck.c
View File

@ -2501,7 +2501,7 @@ build_array_ref (location_t loc, tree array, tree index)
/* ??? Existing practice has been to warn only when the char
index is syntactically the index, not for char[array]. */
if (!swapped)
warn_array_subscript_with_type_char (index);
warn_array_subscript_with_type_char (loc, index);
/* Apply default promotions *after* noticing character types. */
index = default_conversion (index);

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2015-01-05 Marek Polacek <polacek@redhat.com>
PR c/64423
* typeck.c (cp_build_array_ref): Pass loc down to
warn_array_subscript_with_type_char.
2014-12-31 Iain Sandoe <iain@codesourcery.com>
* parser.c (cp_parser_primary_expression): If parsing an

4
gcc/cp/typeck.c
View File

@ -3081,7 +3081,7 @@ cp_build_array_ref (location_t loc, tree array, tree idx,
{
tree rval, type;
warn_array_subscript_with_type_char (idx);
warn_array_subscript_with_type_char (loc, idx);
if (!INTEGRAL_OR_UNSCOPED_ENUMERATION_TYPE_P (TREE_TYPE (idx)))
{
@ -3191,7 +3191,7 @@ cp_build_array_ref (location_t loc, tree array, tree idx,
return error_mark_node;
}
warn_array_subscript_with_type_char (idx);
warn_array_subscript_with_type_char (loc, idx);
ret = cp_build_indirect_ref (cp_build_binary_op (input_location,
PLUS_EXPR, ar, ind,

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2015-01-05 Marek Polacek <polacek@redhat.com>
PR c/64423
* gcc.dg/pr64423.c: New test.
2015-01-05 Hans-Peter Nilsson <hp@bitrange.com>
* gcc.dg/debug/debug-1.c: Pass -fno-if-conversion for

13
gcc/testsuite/gcc.dg/pr64423.c Normal file
View File

@ -0,0 +1,13 @@
/* PR c/64423 */
/* { dg-do compile } */
/* { dg-options "-Wchar-subscripts" } */
int a[100];
int
f (char c)
{
return a[c] /* { dg-warning "11:array subscript has type .char." } */
+ a[c] /* { dg-warning "14:array subscript has type .char." } */
+ a[c]; /* { dg-warning "16:array subscript has type .char." } */
}