diff options
| author | Cesar Philippidis <cesar@codesourcery.com> | 2018-04-12 11:48:56 -0700 |
|---|---|---|
| committer | Cesar Philippidis <cesar@gcc.gnu.org> | 2018-04-12 11:48:56 -0700 |
| commit | 6b95d1af3e88992ddea645227eba39ab9f3584df (patch) | |
| tree | 3740cab6519d80544a7d1b15f4397ba33f6a1e81 /gcc | |
| parent | e417946035bda841f537ffab208b5dc7c1a49f8f (diff) | |
| download | gcc-6b95d1af3e88992ddea645227eba39ab9f3584df.zip gcc-6b95d1af3e88992ddea645227eba39ab9f3584df.tar.gz gcc-6b95d1af3e88992ddea645227eba39ab9f3584df.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/lto-streamer-out.c | 8 | ||||
| -rw-r--r-- | gcc/omp-expand.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 |
4 files changed, 12 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0839ab2..6890d2a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-04-12 Cesar Philippidis <cesar@codesourcery.com> + + * lto-streamer-out.c (output_function): Revert 259346. + * omp-expand.c (expand_oacc_for): Likewise. + 2018-04-12 Alexander Monakov <amonakov@ispras.ru> PR rtl-optimization/85354 diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index fd6788a..1d2ab97 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 c7d30ea..bb20490 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 603cb29..2b4f250 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-04-12 Cesar Philippidis <cesar@codesourcery.com> + + * testsuite/libgomp.oacc-c-c++-common/pr84955.c: Revert 259346. + * testsuite/libgomp.oacc-fortran/pr84955.f90: Likewise. + 2018-04-12 Kelvin Nilsen <kelvin@gcc.gnu.org> PR target/85347 |