@@ -8768,7 +8768,7 @@ omp_get_base_pointer (tree expr)
/* Remove COMPONENT_REFS and indirections from EXPR. */
static tree
-strip_components_and_deref (tree expr)
+omp_get_root_term (tree expr)
{
while (TREE_CODE (expr) == COMPONENT_REF
|| TREE_CODE (expr) == INDIRECT_REF
@@ -11168,7 +11168,7 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_STRUCT)
{
- tree base = strip_components_and_deref (decl);
+ tree base = omp_get_root_term (decl);
if (DECL_P (base))
{
decl = base;