diff options
| author | Tobias Burnus <tburnus@baylibre.com> | 2025-05-15 09:15:21 +0200 |
|---|---|---|
| committer | Tobias Burnus <tburnus@baylibre.com> | 2025-05-19 09:49:41 +0200 |
| commit | 57f73c3956572f30f3e0f7a350d958985b11daa5 (patch) | |
| tree | 0f51a6ea0c0a32a2b23859298066b415df2834aa /gcc | |
| parent | ab9ca3a8b1af4119b5849f3615a94e5f1fd4e5a7 (diff) | |
| download | gcc-57f73c3956572f30f3e0f7a350d958985b11daa5.zip gcc-57f73c3956572f30f3e0f7a350d958985b11daa5.tar.gz gcc-57f73c3956572f30f3e0f7a350d958985b11daa5.tar.bz2 | |
OpenMP/Fortran: Fix allocatable-component mapping of derived-type array comps
The check whether the location expression in map clause has allocatable
components was failing for some derived-type array expressions such as
map(var%tiles(1))
as the compiler produced
_4 = var.tiles;
MEMREF(_4, _5);
This commit now also handles this case.
gcc/fortran/ChangeLog:
* trans-openmp.cc (gfc_omp_deep_mapping_do): Handle SSA_NAME if
a def_stmt is available.
libgomp/ChangeLog:
* testsuite/libgomp.fortran/alloc-comp-4.f90: New test.
(cherry picked from commit f99017c3125f4400cf6a098cf5b33d32fe3e6645)
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/trans-openmp.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc index 0b8150f..2a48d4a 100644 --- a/gcc/fortran/trans-openmp.cc +++ b/gcc/fortran/trans-openmp.cc @@ -2478,6 +2478,26 @@ gfc_omp_deep_mapping_do (bool is_cnt, const gimple *ctx, tree clause, else while (TREE_CODE (tmp) == COMPONENT_REF || TREE_CODE (tmp) == ARRAY_REF) tmp = TREE_OPERAND (tmp, TREE_CODE (tmp) == COMPONENT_REF ? 1 : 0); + if (TREE_CODE (tmp) == MEM_REF) + tmp = TREE_OPERAND (tmp, 0); + if (TREE_CODE (tmp) == SSA_NAME) + { + gimple *def_stmt = SSA_NAME_DEF_STMT (tmp); + if (gimple_code (def_stmt) == GIMPLE_ASSIGN) + { + tmp = gimple_assign_rhs1 (def_stmt); + if (poly) + { + tmp = TYPE_FIELDS (type); + type = TREE_TYPE (tmp); + } + else + while (TREE_CODE (tmp) == COMPONENT_REF + || TREE_CODE (tmp) == ARRAY_REF) + tmp = TREE_OPERAND (tmp, + TREE_CODE (tmp) == COMPONENT_REF ? 1 : 0); + } + } /* If the clause argument is nonallocatable, skip is-allocate check. */ if (GFC_DECL_GET_SCALAR_ALLOCATABLE (tmp) || GFC_DECL_GET_SCALAR_POINTER (tmp) |