mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 19:03:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not erase warning data in gimple_set_location

Browse Source 
gimple_set_location is mostly invoked on newly built GIMPLE statements, so
their location is UNKNOWN_LOCATION and setting it will clobber the warning
data of the passed location, if any.

gcc/
	* dwarf2out.cc (output_one_line_info_table): Initialize prev_addr.
	* gimple.h (gimple_set_location): Do not copy warning data from
	the previous location when it is UNKNOWN_LOCATION.
	* optabs.cc (expand_widen_pattern_expr): Always set oprnd{1,2}.
gcc/testsuite/
	* c-c++-common/nonnull-1.c: Remove XFAIL for C++.
This commit is contained in:
Eric Botcazou 2022-06-13 10:03:36 +02:00
parent 6303eee4b9
commit cb1ecf3819
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/dwarf2out.cc
View File

@ -12916,7 +12916,7 @@ output_one_line_info_table (dw_line_info_table *table)
char line_label[MAX_ARTIFICIAL_LABEL_BYTES]; char line_label[MAX_ARTIFICIAL_LABEL_BYTES];
unsigned int current_line = 1; unsigned int current_line = 1;
bool current_is_stmt = DWARF_LINE_DEFAULT_IS_STMT_START; bool current_is_stmt = DWARF_LINE_DEFAULT_IS_STMT_START;
dw_line_info_entry *ent, *prev_addr; dw_line_info_entry *ent, *prev_addr = NULL;
size_t i; size_t i;
unsigned int view; unsigned int view;

3
gcc/gimple.h
View File

@ -1913,7 +1913,8 @@ static inline void
gimple_set_location (gimple *g, location_t location) gimple_set_location (gimple *g, location_t location)
{ {
/* Copy the no-warning data to the statement location. */ /* Copy the no-warning data to the statement location. */
copy_warning (location, g->location); if (g->location != UNKNOWN_LOCATION)
copy_warning (location, g->location);
g->location = location; g->location = location;
} }

6
gcc/optabs.cc
View File

@ -264,10 +264,8 @@ expand_widen_pattern_expr (sepops ops, rtx op0, rtx op1, rtx wide_op,
bool sbool = false; bool sbool = false;
oprnd0 = ops->op0; oprnd0 = ops->op0;
if (nops >= 2) oprnd1 = nops >= 2 ? ops->op1 : NULL_TREE;
oprnd1 = ops->op1; oprnd2 = nops >= 3 ? ops->op2 : NULL_TREE;
if (nops >= 3)
oprnd2 = ops->op2;
tmode0 = TYPE_MODE (TREE_TYPE (oprnd0)); tmode0 = TYPE_MODE (TREE_TYPE (oprnd0));
if (ops->code == VEC_UNPACK_FIX_TRUNC_HI_EXPR if (ops->code == VEC_UNPACK_FIX_TRUNC_HI_EXPR

2
gcc/testsuite/c-c++-common/nonnull-1.c
View File

@ -30,5 +30,5 @@ func (char *cp1, char *cp2, char *cp3, char *cp4)
__attribute__((nonnull (1))) int __attribute__((nonnull (1))) int
func2 (char *cp) func2 (char *cp)
{ {
return (cp != NULL) ? 1 : 0; /* { dg-warning "'nonnull' argument" "cp compared to NULL" { xfail c++ } } */ return (cp != NULL) ? 1 : 0; /* { dg-warning "'nonnull' argument" "cp compared to NULL" } */
} }