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

backport: re PR middle-end/81768 (error: control flow in the middle of basic block)

Browse Source 
Backported from mainline
	2017-09-05  Jakub Jelinek  <jakub@redhat.com>

	PR middle-end/81768
	* omp-expand.c (expand_omp_simd): Force second operands of COND_EXPR
	into gimple val before gimplification fo the COND_EXPR.

	* gcc.dg/gomp/pr81768-1.c: New test.

From-SVN: r251856
This commit is contained in:
Jakub Jelinek 2017-09-07 22:40:06 +02:00 committed by Jakub Jelinek
parent 7804f36f1e
commit 22bfd3f3a9
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,6 +1,12 @@
2017-09-07 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2017-09-05 Jakub Jelinek <jakub@redhat.com>
PR middle-end/81768
* omp-expand.c (expand_omp_simd): Force second operands of COND_EXPR
into gimple val before gimplification fo the COND_EXPR.
2017-09-04 Jakub Jelinek <jakub@redhat.com>
* lra-remat.c (reg_overlap_for_remat_p): Fix a pasto.

12
gcc/omp-expand.c
View File

@ -4725,24 +4725,28 @@ expand_omp_simd (struct omp_region *region, struct omp_for_data *fd)
tree itype2 = TREE_TYPE (fd->loops[i - 1].v);
if (POINTER_TYPE_P (itype2))
itype2 = signed_type_for (itype2);
t = fold_convert (itype2, fd->loops[i - 1].step);
t = force_gimple_operand_gsi (&gsi, t, true, NULL_TREE, true,
GSI_SAME_STMT);
t = build3 (COND_EXPR, itype2,
build2 (fd->loops[i].cond_code, boolean_type_node,
fd->loops[i].v,
fold_convert (itype, fd->loops[i].n2)),
build_int_cst (itype2, 0),
fold_convert (itype2, fd->loops[i - 1].step));
build_int_cst (itype2, 0), t);
if (POINTER_TYPE_P (TREE_TYPE (fd->loops[i - 1].v)))
t = fold_build_pointer_plus (fd->loops[i - 1].v, t);
else
t = fold_build2 (PLUS_EXPR, itype2, fd->loops[i - 1].v, t);
expand_omp_build_assign (&gsi, fd->loops[i - 1].v, t);
t = fold_convert (itype, fd->loops[i].n1);
t = force_gimple_operand_gsi (&gsi, t, true, NULL_TREE, true,
GSI_SAME_STMT);
t = build3 (COND_EXPR, itype,
build2 (fd->loops[i].cond_code, boolean_type_node,
fd->loops[i].v,
fold_convert (itype, fd->loops[i].n2)),
fd->loops[i].v,
fold_convert (itype, fd->loops[i].n1));
fd->loops[i].v, t);
expand_omp_build_assign (&gsi, fd->loops[i].v, t);
}
}

5
gcc/testsuite/ChangeLog
View File

@ -1,6 +1,11 @@
2017-09-07 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2017-09-05 Jakub Jelinek <jakub@redhat.com>
PR middle-end/81768
* gcc.dg/gomp/pr81768-1.c: New test.
2017-09-01 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/81923

15
gcc/testsuite/gcc.dg/gomp/pr81768-1.c Normal file
View File

@ -0,0 +1,15 @@
/* PR middle-end/81768 */
/* { dg-do compile } */
float b[10][15][10];
void
foo (void)
{
float *i;
#pragma omp target parallel for simd schedule(static, 32) collapse(3)
for (i = &b[0][0][0]; i < &b[0][0][10]; i++)
for (float *j = &b[0][15][0]; j > &b[0][0][0]; j -= 10)
for (float *k = &b[0][0][10]; k > &b[0][0][0]; --k)
b[i - &b[0][0][0]][(j - &b[0][0][0]) / 10 - 1][(k - &b[0][0][0]) - 1] -= 3.5;
}