I failed to notice gcc.dg/pr53265.c FAIL after the loop distribution
change. The following amends the testcase with the new expected
diagnostic and adjusts loop distribution to assign a more sensible
location to generated library calls.
Bootstrap / regtest in progress on x86_64-unknwon-linux-gnu.
Richard.
2019-05-24 Richard Biener <rguent...@suse.de>
PR testsuite/90607
* tree-loop-distribution.c (struct partition): Add location
member.
(partition_alloc): Initialize all fields.
(generate_memset_builtin): Use the location recorded in the
partition for the generated call.
(generate_memcpy_builtin): Likewise.
(classify_partition): Record the location of a single store
as location for the partition.
* gcc.dg/pr53265.c: Amend for new expected diagnostic.
Index: gcc/tree-loop-distribution.c
===================================================================
--- gcc/tree-loop-distribution.c (revision 271594)
+++ gcc/tree-loop-distribution.c (working copy)
@@ -636,6 +636,7 @@ struct partition
bitmap stmts;
/* True if the partition defines variable which is used outside of loop. */
bool reduction_p;
+ location_t loc;
enum partition_kind kind;
enum partition_type type;
/* Data references in the partition. */
@@ -653,7 +654,9 @@ partition_alloc (void)
partition *partition = XCNEW (struct partition);
partition->stmts = BITMAP_ALLOC (NULL);
partition->reduction_p = false;
+ partition->loc = UNKNOWN_LOCATION;
partition->kind = PKIND_NORMAL;
+ partition->type = PTYPE_PARALLEL;
partition->datarefs = BITMAP_ALLOC (NULL);
return partition;
}
@@ -1028,6 +1031,7 @@ generate_memset_builtin (struct loop *lo
fn = build_fold_addr_expr (builtin_decl_implicit (BUILT_IN_MEMSET));
fn_call = gimple_build_call (fn, 3, mem, val, nb_bytes);
+ gimple_set_location (fn_call, partition->loc);
gsi_insert_after (&gsi, fn_call, GSI_CONTINUE_LINKING);
fold_stmt (&gsi);
@@ -1072,6 +1076,7 @@ generate_memcpy_builtin (struct loop *lo
false, GSI_CONTINUE_LINKING);
fn = build_fold_addr_expr (builtin_decl_implicit (kind));
fn_call = gimple_build_call (fn, 3, dest, src, nb_bytes);
+ gimple_set_location (fn_call, partition->loc);
gsi_insert_after (&gsi, fn_call, GSI_CONTINUE_LINKING);
fold_stmt (&gsi);
@@ -1706,6 +1711,8 @@ classify_partition (loop_p loop, struct
if (!find_single_drs (loop, rdg, partition, &single_st, &single_ld))
return;
+ partition->loc = gimple_location (DR_STMT (single_st));
+
/* Classify the builtin kind. */
if (single_ld == NULL)
classify_builtin_st (loop, partition, single_st);
Index: gcc/testsuite/gcc.dg/pr53265.c
===================================================================
--- gcc/testsuite/gcc.dg/pr53265.c (revision 271594)
+++ gcc/testsuite/gcc.dg/pr53265.c (working copy)
@@ -38,7 +38,8 @@ fn3 (void)
for (i = 0; i < (int) (sizeof (a) / sizeof (a[0])); i++) /* { dg-message
"note: within this loop" } */
{
c[i + 8] = b[i]; /* { dg-warning "8 invokes undefined behavior" } */
- a[i + 8] = b[i + 8];
+ /* { dg-warning "out of the bounds" "" { target *-*-* } .-1 } */
+ a[i + 8] = b[i + 8]; /* { dg-warning "out of the bounds" } */
}
bar (a);
bar (c);
