From 6b95d1af3e88992ddea645227eba39ab9f3584df Mon Sep 17 00:00:00 2001 From: Cesar Philippidis Date: Thu, 12 Apr 2018 11:48:56 -0700 Subject: [PATCH] Revert 259346. gcc/ * lto-streamer-out.c (output_function): Revert 259346. * omp-expand.c (expand_oacc_for): Likewise. libgomp/ * testsuite/libgomp.oacc-c-c++-common/pr84955.c: Revert 259346. * testsuite/libgomp.oacc-fortran/pr84955.f90:Likewise. From-SVN: r259351 --- gcc/ChangeLog | 5 +++++ gcc/lto-streamer-out.c | 8 ++------ gcc/omp-expand.c | 8 -------- gcc/testsuite/ChangeLog | 5 +++++ .../libgomp.oacc-c-c++-common/pr84955.c | 20 ------------------- .../libgomp.oacc-fortran/pr84955.f90 | 20 ------------------- 6 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c delete mode 100644 libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0839ab29226..6890d2a1ad4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-04-12 Cesar Philippidis + + * lto-streamer-out.c (output_function): Revert 259346. + * omp-expand.c (expand_oacc_for): Likewise. + 2018-04-12 Alexander Monakov PR rtl-optimization/85354 diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index fd6788a69b0..1d2ab9757f1 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -2084,9 +2084,6 @@ output_function (struct cgraph_node *node) /* Set current_function_decl and cfun. */ push_cfun (fn); - /* Fixup loops if required to match discovery done in the reader. */ - loop_optimizer_init (AVOID_CFG_MODIFICATIONS); - /* Make string 0 be a NULL string. */ streamer_write_char_stream (ob->string_stream, 0); @@ -2179,13 +2176,12 @@ output_function (struct cgraph_node *node) streamer_write_record_start (ob, LTO_null); output_cfg (ob, fn); + + pop_cfun (); } else streamer_write_uhwi (ob, 0); - loop_optimizer_finalize (); - pop_cfun (); - /* Create a section to hold the pickled output of this function. */ produce_asm (ob, function); diff --git a/gcc/omp-expand.c b/gcc/omp-expand.c index c7d30ea3964..bb204906ea6 100644 --- a/gcc/omp-expand.c +++ b/gcc/omp-expand.c @@ -5439,14 +5439,6 @@ expand_oacc_for (struct omp_region *region, struct omp_for_data *fd) split->flags ^= EDGE_FALLTHRU | EDGE_TRUE_VALUE; - /* Add a dummy exit for the tiled block when cont_bb is missing. */ - if (cont_bb == NULL) - { - edge e = make_edge (body_bb, exit_bb, EDGE_FALSE_VALUE); - e->probability = profile_probability::even (); - split->probability = profile_probability::even (); - } - /* Initialize the user's loop vars. */ gsi = gsi_start_bb (elem_body_bb); expand_oacc_collapse_vars (fd, true, &gsi, counts, e_offset); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 603cb29be2c..2b4f2504e07 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-04-12 Cesar Philippidis + + * testsuite/libgomp.oacc-c-c++-common/pr84955.c: Revert 259346. + * testsuite/libgomp.oacc-fortran/pr84955.f90: Likewise. + 2018-04-12 Kelvin Nilsen PR target/85347 diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c deleted file mode 100644 index 5910b57b68d..00000000000 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c +++ /dev/null @@ -1,20 +0,0 @@ -/* { dg-do compile } */ - -int -main () -{ - int i, j; - -#pragma acc parallel loop tile(2,3) - for (i = 1; i < 10; i++) - for (j = 1; j < 10; j++) - for (;;) - ; - -#pragma acc parallel loop - for (i = 1; i < 10; i++) - for (;;) - ; - - return i + j; -} diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 deleted file mode 100644 index 878d8a89f41..00000000000 --- a/libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 +++ /dev/null @@ -1,20 +0,0 @@ -! { dg-do compile } - -subroutine s - integer :: i, j - !$acc parallel loop tile(2,3) - do i = 1, 10 - do j = 1, 10 - do - end do - end do - end do - !$acc end parallel loop - - !$acc parallel loop - do i = 1, 10 - do - end do - end do - !$acc end parallel loop -end subroutine s