[gcc/devel/omp/gcc-11] Fix regression of array members in OpenMP map clauses.

[gcc/devel/omp/gcc-11] Fix regression of array members in OpenMP map clauses.

[Kwok Yeung]

https://gcc.gnu.org/g:1d47d0c67e1fc2ee2ef6b85d6b0b659970552d57

commit 1d47d0c67e1fc2ee2ef6b85d6b0b659970552d57
Author: Chung-Lin Tang <cltang@codesourcery.com>
Date:   Fri Feb 26 20:13:29 2021 +0800

    Fix regression of array members in OpenMP map clauses.
    
    Fixed a regression of array members not working in OpenMP map clauses after
    commit bf8605f14ec33ea31233a3567f3184fee667b695.
    
    This patch itself probably should be considered a fix for commit aadfc9843.
    
    2021-02-26  Chung-Lin Tang  <cltang@codesourcery.com>
    
    gcc/cp/ChangeLog:
    
            * semantics.c (handle_omp_array_sections): Adjust position of making
            COMPONENT_REF from FIELD_DECL to earlier position.

Diff:
---
 gcc/cp/semantics.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 3577f17ec98..d37e231641c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5578,6 +5578,8 @@ handle_omp_array_sections (tree c, enum c_omp_region_type ort)
 	    }
 	  OMP_CLAUSE_DECL (c) = first;
 	  OMP_CLAUSE_SIZE (c) = size;
+	  if (TREE_CODE (t) == FIELD_DECL)
+	    t = finish_non_static_data_member (t, NULL_TREE, NULL_TREE);
 	  if (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_MAP
 	      || (TREE_CODE (t) == COMPONENT_REF
 		  && TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE))
@@ -5606,8 +5608,6 @@ handle_omp_array_sections (tree c, enum c_omp_region_type ort)
 	      }
 	  tree c2 = build_omp_clause (OMP_CLAUSE_LOCATION (c),
 				      OMP_CLAUSE_MAP);
-	  if (TREE_CODE (t) == FIELD_DECL)
-	    t = finish_non_static_data_member (t, NULL_TREE, NULL_TREE);
 	  if ((ort & C_ORT_OMP_DECLARE_SIMD) != C_ORT_OMP && ort != C_ORT_ACC)
 	    OMP_CLAUSE_SET_MAP_KIND (c2, GOMP_MAP_POINTER);
 	  else if (TREE_CODE (t) == COMPONENT_REF)