diff options
author | Jakub Jelinek <jakub@redhat.com> | 2008-07-10 17:22:50 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-07-10 17:22:50 +0200 |
commit | b826efd98620ba65956843f515fb1698ea6feecf (patch) | |
tree | f4a082ece9e1b03e1028c0b236c631ddb2287f34 /gcc | |
parent | 38a28aabc1c885725b749248165889e8f1e5180d (diff) | |
download | gcc-b826efd98620ba65956843f515fb1698ea6feecf.zip gcc-b826efd98620ba65956843f515fb1698ea6feecf.tar.gz gcc-b826efd98620ba65956843f515fb1698ea6feecf.tar.bz2 |
re PR middle-end/36790 (ICE on valid code: OpenMP task construct with default(shared) clause)
PR middle-end/36790
* omp-low.c (lower_omp_2): If task_shared_vars, test all DECL_P
uids in the bitmap, not just VAR_DECL uids.
* gcc.dg/gomp/pr36790.c: New test.
* g++.dg/gomp/pr36790.C: New test.
From-SVN: r137695
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/omp-low.c | 10 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/gomp/pr36790.C | 23 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/gomp/pr36790.c | 23 |
5 files changed, 60 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c5b36ec..96e6b13 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2008-07-10 Jakub Jelinek <jakub@redhat.com> + PR middle-end/36790 + * omp-low.c (lower_omp_2): If task_shared_vars, test all DECL_P + uids in the bitmap, not just VAR_DECL uids. + PR rtl-optimization/36419 * combine-stack-adj.c (adjust_frame_related_expr): New function. (combine_stack_adjustments_for_block): Call it if needed. Delete diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 4378c43..2f9aede 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -6246,10 +6246,12 @@ lower_omp_2 (tree *tp, int *walk_subtrees, void *data) omp_context *ctx = (omp_context *) data; /* Any variable with DECL_VALUE_EXPR needs to be regimplified. */ - if (TREE_CODE (t) == VAR_DECL - && ((ctx && DECL_HAS_VALUE_EXPR_P (t)) - || (task_shared_vars - && bitmap_bit_p (task_shared_vars, DECL_UID (t))))) + if (TREE_CODE (t) == VAR_DECL && ctx && DECL_HAS_VALUE_EXPR_P (t)) + return t; + + if (task_shared_vars + && DECL_P (t) + && bitmap_bit_p (task_shared_vars, DECL_UID (t))) return t; /* If a global variable has been privatized, TREE_CONSTANT on diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3c15329..e4ac8e7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2008-07-10 Jakub Jelinek <jakub@redhat.com> + PR middle-end/36790 + * gcc.dg/gomp/pr36790.c: New test. + * g++.dg/gomp/pr36790.C: New test. + PR rtl-optimization/36419 * g++.dg/eh/async-unwind1.C: New test. diff --git a/gcc/testsuite/g++.dg/gomp/pr36790.C b/gcc/testsuite/g++.dg/gomp/pr36790.C new file mode 100644 index 0000000..07e8b10 --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr36790.C @@ -0,0 +1,23 @@ +// PR middle-end/36790 +// { dg-do compile } +// { dg-options "-fopenmp -O2" } + +void +foo (bool b) +{ +} + +void +bar (bool b) +{ + foo (b); + #pragma omp task default (shared) + b = false; +} + +int +main () +{ + bar (false); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/gomp/pr36790.c b/gcc/testsuite/gcc.dg/gomp/pr36790.c new file mode 100644 index 0000000..b3379f1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/pr36790.c @@ -0,0 +1,23 @@ +/* PR middle-end/36790 */ +/* { dg-do compile } */ +/* { dg-options "-fopenmp" } */ + +void +foo (char b) +{ +} + +void +bar (char b) +{ + foo (b); + #pragma omp task default (shared) + b = 0; +} + +int +main () +{ + bar (0); + return 0; +} |