diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-08-16 18:50:47 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-08-16 18:50:47 +0200 |
| commit | 7841800f7a5fec82615b74f8ed9beb48f0e152ef (patch) | |
| tree | 76e41ddbeef6acd461eab2ef7d383b9945cbd27e /gcc | |
| parent | 1b13411a13e274d5e01b73704df9edd2639eedb4 (diff) | |
| download | gcc-7841800f7a5fec82615b74f8ed9beb48f0e152ef.zip gcc-7841800f7a5fec82615b74f8ed9beb48f0e152ef.tar.gz gcc-7841800f7a5fec82615b74f8ed9beb48f0e152ef.tar.bz2 | |
re PR target/71910 (ICE on valid OpenMP code)
PR target/71910
* tree-cfg.c (execute_fixup_cfg): Add node variable, use it. Before inlining,
add cgraph edge for the added __builtin_unreachable call.
* g++.dg/gomp/pr71910.C: New test.
From-SVN: r239508
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gomp/pr71910.C | 13 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 25 |
4 files changed, 36 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e2bec5f..b99c745 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2016-08-16 Jakub Jelinek <jakub@redhat.com> + PR target/71910 + * tree-cfg.c (execute_fixup_cfg): Add node variable, use it. Before inlining, + add cgraph edge for the added __builtin_unreachable call. + PR middle-end/67485 * expmed.c (expand_mult_const): Change val_so_far's type to UHWI, only cast it to SHWI for the final comparison. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f9668c9..3bc6028 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2016-08-16 Jakub Jelinek <jakub@redhat.com> + PR target/71910 + * g++.dg/gomp/pr71910.C: New test. + PR middle-end/67485 * gcc.c-torture/compile/pr67485.c: New test. diff --git a/gcc/testsuite/g++.dg/gomp/pr71910.C b/gcc/testsuite/g++.dg/gomp/pr71910.C new file mode 100644 index 0000000..0063be8 --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr71910.C @@ -0,0 +1,13 @@ +// PR target/71910 +// { dg-do compile } +// { dg-additional-options "-O2" } + +#include <vector> + +int +main () +{ + std::vector<double> vec(10); +#pragma omp parallel + __builtin_exit (0); +} diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 4036223..4e55a83 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -8987,16 +8987,14 @@ execute_fixup_cfg (void) gcov_type count_scale; edge e; edge_iterator ei; + cgraph_node *node = cgraph_node::get (current_function_decl); count_scale - = GCOV_COMPUTE_SCALE (cgraph_node::get (current_function_decl)->count, - ENTRY_BLOCK_PTR_FOR_FN (cfun)->count); + = GCOV_COMPUTE_SCALE (node->count, ENTRY_BLOCK_PTR_FOR_FN (cfun)->count); - ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = - cgraph_node::get (current_function_decl)->count; - EXIT_BLOCK_PTR_FOR_FN (cfun)->count = - apply_scale (EXIT_BLOCK_PTR_FOR_FN (cfun)->count, - count_scale); + ENTRY_BLOCK_PTR_FOR_FN (cfun)->count = node->count; + EXIT_BLOCK_PTR_FOR_FN (cfun)->count + = apply_scale (EXIT_BLOCK_PTR_FOR_FN (cfun)->count, count_scale); FOR_EACH_EDGE (e, ei, ENTRY_BLOCK_PTR_FOR_FN (cfun)->succs) e->count = apply_scale (e->count, count_scale); @@ -9089,10 +9087,19 @@ execute_fixup_cfg (void) { if (stmt && is_gimple_call (stmt)) gimple_call_set_ctrl_altering (stmt, false); - stmt = gimple_build_call - (builtin_decl_implicit (BUILT_IN_UNREACHABLE), 0); + tree fndecl = builtin_decl_implicit (BUILT_IN_UNREACHABLE); + stmt = gimple_build_call (fndecl, 0); gimple_stmt_iterator gsi = gsi_last_bb (bb); gsi_insert_after (&gsi, stmt, GSI_NEW_STMT); + if (!cfun->after_inlining) + { + gcall *call_stmt = dyn_cast <gcall *> (stmt); + int freq + = compute_call_stmt_bb_frequency (current_function_decl, + bb); + node->create_edge (cgraph_node::get_create (fndecl), + call_stmt, bb->count, freq); + } } } } |