diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-11-25 00:08:26 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-11-25 00:08:26 +0100 |
| commit | 3f9e8f13a316a0044bd303983746cafba804d646 (patch) | |
| tree | d83db1c113f6d65bcbb7993517f743311e6b26e2 /gcc/fortran/trans-openmp.c | |
| parent | 05e729ec76723889b44f8bd3176666800c514a0d (diff) | |
| download | gcc-3f9e8f13a316a0044bd303983746cafba804d646.zip gcc-3f9e8f13a316a0044bd303983746cafba804d646.tar.gz gcc-3f9e8f13a316a0044bd303983746cafba804d646.tar.bz2 | |
re PR fortran/63938 (OpenMP atomic update does not protect access to automatic array)
PR fortran/63938
* trans-openmp.c (gfc_trans_omp_atomic): Make sure lhsaddr is
simple enough for goa_lhs_expr_p.
* libgomp.fortran/pr63938-1.f90: New test.
* libgomp.fortran/pr63938-2.f90: New test.
From-SVN: r218031
Diffstat (limited to 'gcc/fortran/trans-openmp.c')
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 038c3e9..d7660d7 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -2683,6 +2683,18 @@ gfc_trans_omp_atomic (gfc_code *code) } lhsaddr = save_expr (lhsaddr); + if (TREE_CODE (lhsaddr) != SAVE_EXPR + && (TREE_CODE (lhsaddr) != ADDR_EXPR + || TREE_CODE (TREE_OPERAND (lhsaddr, 0)) != VAR_DECL)) + { + /* Make sure LHS is simple enough so that goa_lhs_expr_p can recognize + it even after unsharing function body. */ + tree var = create_tmp_var_raw (TREE_TYPE (lhsaddr), NULL); + DECL_CONTEXT (var) = current_function_decl; + lhsaddr = build4 (TARGET_EXPR, TREE_TYPE (lhsaddr), var, lhsaddr, + NULL_TREE, NULL_TREE); + } + rhs = gfc_evaluate_now (rse.expr, &block); if (((atomic_code->ext.omp_atomic & GFC_OMP_ATOMIC_MASK) |