Skip to content

R
riscv-gcc-1
Commit 96b40f8d by Marek Polacek Committed by Marek Polacek
Options

re PR c/60257 (Incorrect column number and confusing message in -Woverride-init) 

	PR c/60257
	* c-typeck.c (warning_init): Add location_t parameter.  Call
	warning_at instead of warning.
	(push_init_level): Pass input_location to warning_init.
	(add_pending_init): Add location_t parameter.  Pass loc to
	warning_init.
	(set_nonincremental_init): Pass input_location to add_pending_init.
	(set_nonincremental_init_from_string): Likewise.
	(output_init_element): Pass loc to warning_init and to
	add_pending_init.

	* gcc.dg/pr60257.c: New test.

From-SVN: r209974
parent 32e00768
Showing with 84 additions and 22 deletions
gcc/c/ChangeLog
2014-05-01 Marek Polacek <polacek@redhat.com>
PR c/60257
* c-typeck.c (warning_init): Add location_t parameter. Call
warning_at instead of warning.
(push_init_level): Pass input_location to warning_init.
(add_pending_init): Add location_t parameter. Pass loc to
warning_init.
(set_nonincremental_init): Pass input_location to add_pending_init.
(set_nonincremental_init_from_string): Likewise.
(output_init_element): Pass loc to warning_init and to
add_pending_init.
2014-05-01 Marek Polacek <polacek@redhat.com>
PR c/43395
* c-typeck.c (c_finish_return): Distinguish between label and variable
when warning about returning local address.
......
gcc/c/c-typeck.c
......@@ -100,14 +100,15 @@ static void push_string (const char *);
static void push_member_name (tree);
static int spelling_length (void);
static char *print_spelling (char *);
static void warning_init (int, const char *);
static void warning_init (location_t, int, const char *);
static tree digest_init (location_t, tree, tree, tree, bool, bool, int);
static void output_init_element (location_t, tree, tree, bool, tree, tree, int,
bool, struct obstack *);
static void output_pending_init_elements (int, struct obstack *);
static int set_designator (int, struct obstack *);
static void push_range_stack (tree, struct obstack *);
static void add_pending_init (tree, tree, tree, bool, struct obstack *);
static void add_pending_init (location_t, tree, tree, tree, bool,
struct obstack *);
static void set_nonincremental_init (struct obstack *);
static void set_nonincremental_init_from_string (tree, struct obstack *);
static tree find_init_member (tree, struct obstack *);
......@@ -6446,15 +6447,15 @@ pedwarn_init (location_t location, int opt, const char *gmsgid)
component name is taken from the spelling stack. */
static void
warning_init (int opt, const char *gmsgid)
warning_init (location_t loc, int opt, const char *gmsgid)
{
char *ofwhat;
/* The gmsgid may be a format string with %< and %>. */
warning (opt, gmsgid);
warning_at (loc, opt, gmsgid);
ofwhat = print_spelling ((char *) alloca (spelling_length () + 1));
if (*ofwhat)
warning (opt, "(near initialization for %qs)", ofwhat);
warning_at (loc, opt, "(near initialization for %qs)", ofwhat);
}
/* If TYPE is an array type and EXPR is a parenthesized string
......@@ -7300,7 +7301,8 @@ push_init_level (int implicit, struct obstack * braced_init_obstack)
if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned)
{
missing_braces_mentioned = 1;
warning_init (OPT_Wmissing_braces, "missing braces around initializer");
warning_init (input_location, OPT_Wmissing_braces,
"missing braces around initializer");
}
if (TREE_CODE (constructor_type) == RECORD_TYPE
......@@ -7361,7 +7363,7 @@ push_init_level (int implicit, struct obstack * braced_init_obstack)
else
{
if (constructor_type != error_mark_node)
warning_init (0, "braces around scalar initializer");
warning_init (input_location, 0, "braces around scalar initializer");
constructor_fields = constructor_type;
constructor_unfilled_fields = constructor_type;
}
......@@ -7776,8 +7778,8 @@ set_init_label (tree fieldname, struct obstack * braced_init_obstack)
existing initializer. */
static void
add_pending_init (tree purpose, tree value, tree origtype, bool implicit,
struct obstack * braced_init_obstack)
add_pending_init (location_t loc, tree purpose, tree value, tree origtype,
bool implicit, struct obstack *braced_init_obstack)
{
struct init_node *p, **q, *r;
......@@ -7798,9 +7800,12 @@ add_pending_init (tree purpose, tree value, tree origtype, bool implicit,
if (!implicit)
{
if (TREE_SIDE_EFFECTS (p->value))
warning_init (0, "initialized field with side-effects overwritten");
warning_init (loc, 0,
"initialized field with side-effects "
"overwritten");
else if (warn_override_init)
warning_init (OPT_Woverride_init, "initialized field overwritten");
warning_init (loc, OPT_Woverride_init,
"initialized field overwritten");
}
p->value = value;
p->origtype = origtype;
......@@ -7825,9 +7830,12 @@ add_pending_init (tree purpose, tree value, tree origtype, bool implicit,
if (!implicit)
{
if (TREE_SIDE_EFFECTS (p->value))
warning_init (0, "initialized field with side-effects overwritten");
warning_init (loc, 0,
"initialized field with side-effects "
"overwritten");
else if (warn_override_init)
warning_init (OPT_Woverride_init, "initialized field overwritten");
warning_init (loc, OPT_Woverride_init,
"initialized field overwritten");
}
p->value = value;
p->origtype = origtype;
......@@ -8016,10 +8024,8 @@ set_nonincremental_init (struct obstack * braced_init_obstack)
return;
FOR_EACH_CONSTRUCTOR_ELT (constructor_elements, ix, index, value)
{
add_pending_init (index, value, NULL_TREE, true,
add_pending_init (input_location, index, value, NULL_TREE, true,
braced_init_obstack);
}
constructor_elements = NULL;
if (TREE_CODE (constructor_type) == RECORD_TYPE)
{
......@@ -8112,7 +8118,7 @@ set_nonincremental_init_from_string (tree str,
}
value = build_int_cst_wide (type, val[1], val[0]);
add_pending_init (purpose, value, NULL_TREE, true,
add_pending_init (input_location, purpose, value, NULL_TREE, true,
braced_init_obstack);
}
......@@ -8278,7 +8284,7 @@ output_init_element (location_t loc, tree value, tree origtype,
if (checktype != error_mark_node
&& (TYPE_MAIN_VARIANT (checktype)
!= TYPE_MAIN_VARIANT (DECL_BIT_FIELD_TYPE (field))))
warning_init (OPT_Wc___compat,
warning_init (loc, OPT_Wc___compat,
"enum conversion in initialization is invalid in C++");
}
......@@ -8314,7 +8320,7 @@ output_init_element (location_t loc, tree value, tree origtype,
&& tree_int_cst_lt (field, constructor_unfilled_index))
set_nonincremental_init (braced_init_obstack);
add_pending_init (field, value, origtype, implicit,
add_pending_init (loc, field, value, origtype, implicit,
braced_init_obstack);
return;
}
......@@ -8341,7 +8347,7 @@ output_init_element (location_t loc, tree value, tree origtype,
}
}
add_pending_init (field, value, origtype, implicit,
add_pending_init (loc, field, value, origtype, implicit,
braced_init_obstack);
return;
}
......@@ -8351,10 +8357,11 @@ output_init_element (location_t loc, tree value, tree origtype,
if (!implicit)
{
if (TREE_SIDE_EFFECTS (constructor_elements->last ().value))
warning_init (0,
warning_init (loc, 0,
"initialized field with side-effects overwritten");
else if (warn_override_init)
warning_init (OPT_Woverride_init, "initialized field overwritten");
warning_init (loc, OPT_Woverride_init,
"initialized field overwritten");
}
/* We can have just one union field set. */
......
gcc/testsuite/ChangeLog
2014-05-01 Marek Polacek <polacek@redhat.com>
PR c/60257
* gcc.dg/pr60257.c: New test.
2014-05-01 Marek Polacek <polacek@redhat.com>
PR c/43395
* c-c++-common/pr43395.c: New test.
......
gcc/testsuite/gcc.dg/pr60257.c 0 → 100644
/* PR c/60257 */
/* { dg-do compile } */
/* { dg-options "-Wc++-compat -Woverride-init" } */
/* { dg-prune-output ".*near initialization for.*" } */
enum E1 { A };
enum E2 { B };
struct S
{
enum E1 e: 3;
};
struct S s[] =
{
{ B } /* { dg-warning "5:enum conversion in initialization is invalid in C\[+\]\[+\]" } */
};
union U {
int i;
long long int l;
};
struct R {
int a;
};
void
foo (int i)
{
union U u = { .i = ++i, .l = 1 }; /* { dg-warning "32:initialized field with side-effects overwritten" } */
union U u2 = { .i = 1, .l = 3 }; /* { dg-warning "31:initialized field overwritten" } */
int a[] = { i++, [0] = 1 }; /* { dg-warning "26:initialized field with side-effects overwritten" } */
int a2[] = { i, [0] = 1 }; /* { dg-warning "25:initialized field overwritten" } */
struct R r = { 1, .a = 2 }; /* { dg-warning "26:initialized field overwritten" } */
struct R r2 = { ++i, .a = 2 }; /* { dg-warning "29:initialized field with side-effects overwritten" } */
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment