From 4cdc152ea7155977ec2bcbe4ecff5361a66b8283 Mon Sep 17 00:00:00 2001 From: Julian Brown Date: Mon, 19 Apr 2021 06:24:41 -0700 Subject: [PATCH] [og11] Unify ARRAY_REF/INDIRECT_REF stripping code in extract_base_bit_offset For historical reasons, it seems that extract_base_bit_offset unnecessarily used two different ways to strip ARRAY_REF/INDIRECT_REF nodes from component accesses. I verified that the two ways of performing the operation gave the same results across the whole testsuite (and several additional benchmarks). The code was like this since an earlier "mechanical" refactoring by me, first posted here: https://gcc.gnu.org/pipermail/gcc-patches/2018-November/510503.html It was never clear to me if there was an important semantic difference between the two ways of stripping the base before calling get_inner_reference, but it appears that there is not, so one can go away. 2021-06-02 Julian Brown gcc/ * gimplify.cc (extract_base_bit_offset): Unify ARRAY_REF/INDIRECT_REF stripping code in first call/subsequent call cases. --- gcc/ChangeLog.omp | 5 +++++ gcc/gimplify.cc | 32 +++++++++++--------------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index bfc3bfa18ef1..cc41450caa65 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,8 @@ +2021-06-02 Julian Brown + + * gimplify.cc (extract_base_bit_offset): Unify ARRAY_REF/INDIRECT_REF + stripping code in first call/subsequent call cases. + 2021-06-02 Julian Brown * gimplify.cc (gimplify_scan_omp_clauses): Simplify condition diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 4eca97d2903e..59903ed17791 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -8824,31 +8824,21 @@ extract_base_bit_offset (tree base, tree *base_ref, poly_int64 *bitposp, poly_offset_int poffset; if (base_ref) - { - *base_ref = NULL_TREE; - - while (TREE_CODE (base) == ARRAY_REF) - base = TREE_OPERAND (base, 0); + *base_ref = NULL_TREE; - if (TREE_CODE (base) == INDIRECT_REF) - base = TREE_OPERAND (base, 0); - } - else + if (TREE_CODE (base) == ARRAY_REF) { - if (TREE_CODE (base) == ARRAY_REF) - { - while (TREE_CODE (base) == ARRAY_REF) - base = TREE_OPERAND (base, 0); - if (TREE_CODE (base) != COMPONENT_REF - || TREE_CODE (TREE_TYPE (base)) != ARRAY_TYPE) - return NULL_TREE; - } - else if (TREE_CODE (base) == INDIRECT_REF - && TREE_CODE (TREE_OPERAND (base, 0)) == COMPONENT_REF - && (TREE_CODE (TREE_TYPE (TREE_OPERAND (base, 0))) - == REFERENCE_TYPE)) + while (TREE_CODE (base) == ARRAY_REF) base = TREE_OPERAND (base, 0); + if (TREE_CODE (base) != COMPONENT_REF + || TREE_CODE (TREE_TYPE (base)) != ARRAY_TYPE) + return NULL_TREE; } + else if (TREE_CODE (base) == INDIRECT_REF + && TREE_CODE (TREE_OPERAND (base, 0)) == COMPONENT_REF + && (TREE_CODE (TREE_TYPE (TREE_OPERAND (base, 0))) + == REFERENCE_TYPE)) + base = TREE_OPERAND (base, 0); base = get_inner_reference (base, &bitsize, &bitpos, &offset, &mode, &unsignedp, &reversep, &volatilep); -- 2.47.2