diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-06-09 23:18:42 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2006-06-09 23:18:42 +0200 |
| commit | cd75853e1d1279a99afc0e5dc46b30edca64e6f4 (patch) | |
| tree | 530c2e857eb28361de2db9d88b30a1ef04da4efb /gcc/fortran | |
| parent | 1c90c6f9c03360da9f6b01ef0ec28e309a0bb892 (diff) | |
| download | gcc-cd75853e1d1279a99afc0e5dc46b30edca64e6f4.zip gcc-cd75853e1d1279a99afc0e5dc46b30edca64e6f4.tar.gz gcc-cd75853e1d1279a99afc0e5dc46b30edca64e6f4.tar.bz2 | |
re PR fortran/27916 (Problem with allocatable arrays inside OpenMP do loop)
PR fortran/27916
* trans-openmp.c (gfc_omp_clause_default_ctor): New function.
* trans.h (gfc_omp_clause_default_ctor): New prototype.
* f95-lang.c (LANG_HOOKS_OMP_CLAUSE_DEFAULT_CTOR): Define.
* testsuite/libgomp.fortran/pr27916-1.f90: New test.
* testsuite/libgomp.fortran/pr27916-2.f90: New test.
From-SVN: r114520
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/f95-lang.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 23 | ||||
| -rw-r--r-- | gcc/fortran/trans.h | 1 |
4 files changed, 33 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0a3d2c1..a576a2e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2006-06-09 Jakub Jelinek <jakub@redhat.com> + + PR fortran/27916 + * trans-openmp.c (gfc_omp_clause_default_ctor): New function. + * trans.h (gfc_omp_clause_default_ctor): New prototype. + * f95-lang.c (LANG_HOOKS_OMP_CLAUSE_DEFAULT_CTOR): Define. + 2006-06-08 Francois-Xavier Coudert <coudert@clipper.ens.fr> PR fortran/27958 diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c index 7257924..6dc00da 100644 --- a/gcc/fortran/f95-lang.c +++ b/gcc/fortran/f95-lang.c @@ -120,6 +120,7 @@ static HOST_WIDE_INT gfc_get_alias_set (tree); #undef LANG_HOOKS_GET_ALIAS_SET #undef LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE #undef LANG_HOOKS_OMP_PREDETERMINED_SHARING +#undef LANG_HOOKS_OMP_CLAUSE_DEFAULT_CTOR #undef LANG_HOOKS_OMP_DISREGARD_VALUE_EXPR #undef LANG_HOOKS_OMP_PRIVATE_DEBUG_CLAUSE #undef LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES @@ -144,6 +145,7 @@ static HOST_WIDE_INT gfc_get_alias_set (tree); #define LANG_HOOKS_GET_ALIAS_SET gfc_get_alias_set #define LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE gfc_omp_privatize_by_reference #define LANG_HOOKS_OMP_PREDETERMINED_SHARING gfc_omp_predetermined_sharing +#define LANG_HOOKS_OMP_CLAUSE_DEFAULT_CTOR gfc_omp_clause_default_ctor #define LANG_HOOKS_OMP_DISREGARD_VALUE_EXPR gfc_omp_disregard_value_expr #define LANG_HOOKS_OMP_PRIVATE_DEBUG_CLAUSE gfc_omp_private_debug_clause #define LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES \ diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index b7c6f9e..76124ac 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -94,6 +94,29 @@ gfc_omp_predetermined_sharing (tree decl) return OMP_CLAUSE_DEFAULT_UNSPECIFIED; } + +/* Return code to initialize DECL with its default constructor, or + NULL if there's nothing to do. */ + +tree +gfc_omp_clause_default_ctor (tree clause ATTRIBUTE_UNUSED, tree decl) +{ + tree type = TREE_TYPE (decl); + stmtblock_t block; + + if (! GFC_DESCRIPTOR_TYPE_P (type)) + return NULL; + + /* Allocatable arrays in PRIVATE clauses need to be set to + "not currently allocated" allocation status. */ + gfc_init_block (&block); + + gfc_conv_descriptor_data_set (&block, decl, null_pointer_node); + + return gfc_finish_block (&block); +} + + /* Return true if DECL's DECL_VALUE_EXPR (if any) should be disregarded in OpenMP construct, because it is going to be remapped during OpenMP lowering. SHARED is true if DECL diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h index 738ed02..ce99793 100644 --- a/gcc/fortran/trans.h +++ b/gcc/fortran/trans.h @@ -451,6 +451,7 @@ tree builtin_function (const char *, tree, int, enum built_in_class, /* In trans-openmp.c */ bool gfc_omp_privatize_by_reference (tree); enum omp_clause_default_kind gfc_omp_predetermined_sharing (tree); +tree gfc_omp_clause_default_ctor (tree, tree); bool gfc_omp_disregard_value_expr (tree, bool); bool gfc_omp_private_debug_clause (tree, bool); struct gimplify_omp_ctx; |