diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-01-19 18:49:46 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-01-19 18:49:46 +0100 |
| commit | 135a171d9eac312352f58e0c09abac9156d9fbda (patch) | |
| tree | c47ee4cdc097d5f98d818d66731d4ecf07beeff8 /gcc/tree-cfg.c | |
| parent | d7e2fcd0038214e3e3d9301fa7f22cccb54de009 (diff) | |
| download | gcc-135a171d9eac312352f58e0c09abac9156d9fbda.zip gcc-135a171d9eac312352f58e0c09abac9156d9fbda.tar.gz gcc-135a171d9eac312352f58e0c09abac9156d9fbda.tar.bz2 | |
re PR gcov-profile/34610 (ICE with "-fprofile-arcs -fopenmp")
PR gcov-profile/34610
* tree-cfg.c (make_edges): Mark both outgoing edges from
OMP_CONTINUE and from OMP_FOR as EDGE_ABNORMAL.
* omp-low.c (expand_omp_for): Clear EDGE_ABNORMAL bits
from OMP_FOR and OMP_CONTINUE outgoing edges.
* tree-profile.c (tree_profiling): Return early if
cfun->after_tree_profile != 0. Set cfun->after_tree_profile
at the end.
* omp-low.c (expand_omp_parallel): Copy after_tree_profile
from cfun to child_cfun.
* function.h (struct function): Add after_tree_profile bit.
* gcc.dg/gomp/pr34610.c: New test.
From-SVN: r131653
Diffstat (limited to 'gcc/tree-cfg.c')
| -rw-r--r-- | gcc/tree-cfg.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 8da55ff..c702502 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -1,5 +1,5 @@ /* Control flow functions for trees. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Contributed by Diego Novillo <dnovillo@redhat.com> @@ -544,14 +544,19 @@ make_edges (void) switch (cur_region->type) { case OMP_FOR: + /* Mark all OMP_FOR and OMP_CONTINUE succs edges as abnormal + to prevent splitting them. */ + single_succ_edge (cur_region->entry)->flags |= EDGE_ABNORMAL; /* Make the loopback edge. */ - make_edge (bb, single_succ (cur_region->entry), 0); - + make_edge (bb, single_succ (cur_region->entry), + EDGE_ABNORMAL); + /* Create an edge from OMP_FOR to exit, which corresponds to the case that the body of the loop is not executed at all. */ - make_edge (cur_region->entry, bb->next_bb, 0); - fallthru = true; + make_edge (cur_region->entry, bb->next_bb, EDGE_ABNORMAL); + make_edge (bb, bb->next_bb, EDGE_FALLTHRU | EDGE_ABNORMAL); + fallthru = false; break; case OMP_SECTIONS: |