From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 6B9403853560; Wed, 29 Jun 2022 14:37:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6B9403853560 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] Fix bug in processing of array dimensions in data clauses. X-Act-Checkin: gcc X-Git-Author: Sandra Loosemore X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 8ce5285eeb9b0a616a5ea0585fda279ec2fc71c4 X-Git-Newrev: 49577050cb3e16a17e57c08c58bbe16f97bf94a5 Message-Id: <20220629143723.6B9403853560@sourceware.org> Date: Wed, 29 Jun 2022 14:37:23 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2022 14:37:23 -0000 https://gcc.gnu.org/g:49577050cb3e16a17e57c08c58bbe16f97bf94a5 commit 49577050cb3e16a17e57c08c58bbe16f97bf94a5 Author: Sandra Loosemore Date: Tue Mar 31 14:29:09 2020 -0700 Fix bug in processing of array dimensions in data clauses. The g++ front end wraps the array length and low_bound values in NON_LVALUE_EXPR, causing the subsequent tests for INTEGER_CST to fail. The test case c-c++-common/goacc/kernels-loop-annotation-1.c was tickling this bug and giving bogus errors in g++ because it was falling through to dynamic array code instead of recognizing the constant bounds. This patch was posted upstream here https://gcc.gnu.org/pipermail/gcc-patches/2020-March/542694.html but not yet committed. It may be that some other fix for this problem is implemented on mainline instead; check before merging this patch. 2020-03-31 Sandra Loosemore gcc/cp/ * semantics.cc (handle_omp_array_sections_1): Call STRIP_NOPS on length and low_bound; (handle_omp_array_sections): Likewise. Diff: --- gcc/cp/ChangeLog.omp | 6 ++++++ gcc/cp/semantics.cc | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp index 74a672d653f..ead9de41a2c 100644 --- a/gcc/cp/ChangeLog.omp +++ b/gcc/cp/ChangeLog.omp @@ -1,3 +1,9 @@ +2020-03-31 Sandra Loosemore + + * semantics.cc (handle_omp_array_sections_1): Call STRIP_NOPS + on length and low_bound; + (handle_omp_array_sections): Likewise. + 2020-03-27 Sandra Loosemore * decl.cc (cp_unwrap_for_init): New. diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 7bcd8094bb1..2c0e1c7eaa0 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -5185,6 +5185,10 @@ handle_omp_array_sections_1 (tree c, tree t, vec &types, if (length) length = mark_rvalue_use (length); /* We need to reduce to real constant-values for checks below. */ + if (length) + STRIP_NOPS (length); + if (low_bound) + STRIP_NOPS (low_bound); if (length) length = fold_simple (length); if (low_bound) @@ -5517,6 +5521,11 @@ handle_omp_array_sections (tree c, enum c_omp_region_type ort) tree low_bound = TREE_PURPOSE (t); tree length = TREE_VALUE (t); + if (length) + STRIP_NOPS (length); + if (low_bound) + STRIP_NOPS (low_bound); + i--; if (low_bound && TREE_CODE (low_bound) == INTEGER_CST