public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Chung-Lin Tang <cltang@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] openacc: fix ICE for non-decl expression in non-contiguous array base-pointer Date: Thu, 19 Aug 2021 11:43:27 +0000 (GMT) [thread overview] Message-ID: <20210819114327.D23D63858438@sourceware.org> (raw) https://gcc.gnu.org/g:4e34710679ac084d7ca15ccf387c1b6f1e64c2d1 commit 4e34710679ac084d7ca15ccf387c1b6f1e64c2d1 Author: Chung-Lin Tang <cltang@codesourcery.com> Date: Thu Aug 19 16:17:02 2021 +0800 openacc: fix ICE for non-decl expression in non-contiguous array base-pointer Currently, we do not support cases like struct-members as the base-pointer for an OpenACC non-contiguous array. Mark such cases as unsupported in the C/C++ front-ends, instead of ICEing on them. gcc/c/ChangeLog: * c-typeck.c (handle_omp_array_sections_1): Robustify non-contiguous array check and reject non-DECL base-pointer cases as unsupported. gcc/cp/ChangeLog: * semantics.c (handle_omp_array_sections_1): Robustify non-contiguous array check and reject non-DECL base-pointer cases as unsupported. Diff: --- gcc/c/c-typeck.c | 35 +++++++++++++++++++++++------------ gcc/cp/semantics.c | 39 ++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 9c4822bbf27..a8b54c676c0 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -13431,25 +13431,36 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types, && OMP_CLAUSE_CODE (c) != OMP_CLAUSE_AFFINITY && TREE_CODE (TREE_CHAIN (t)) == TREE_LIST) { - if (ort == C_ORT_ACC) - /* Note that OpenACC does accept these kinds of non-contiguous - pointer based arrays. */ - non_contiguous = true; - else + /* If any prior dimension has a non-one length, then deem this + array section as non-contiguous. */ + for (tree d = TREE_CHAIN (t); TREE_CODE (d) == TREE_LIST; + d = TREE_CHAIN (d)) { - /* If any prior dimension has a non-one length, then deem this - array section as non-contiguous. */ - for (tree d = TREE_CHAIN (t); TREE_CODE (d) == TREE_LIST; - d = TREE_CHAIN (d)) + tree d_length = TREE_VALUE (d); + if (d_length == NULL_TREE || !integer_onep (d_length)) { - tree d_length = TREE_VALUE (d); - if (d_length == NULL_TREE || !integer_onep (d_length)) + if (ort == C_ORT_ACC) { + while (TREE_CODE (d) == TREE_LIST) + d = TREE_CHAIN (d); + if (DECL_P (d)) + { + /* Note that OpenACC does accept these kinds of + non-contiguous pointer based arrays. */ + non_contiguous = true; + break; + } error_at (OMP_CLAUSE_LOCATION (c), - "array section is not contiguous in %qs clause", + "base-pointer expression in %qs clause not " + "supported for non-contiguous arrays", omp_clause_code_name[OMP_CLAUSE_CODE (c)]); return error_mark_node; } + + error_at (OMP_CLAUSE_LOCATION (c), + "array section is not contiguous in %qs clause", + omp_clause_code_name[OMP_CLAUSE_CODE (c)]); + return error_mark_node; } } } diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index e56ad8aa1e1..ad62ad76ff9 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -5292,32 +5292,41 @@ handle_omp_array_sections_1 (tree c, tree t, vec<tree> &types, return error_mark_node; } /* If there is a pointer type anywhere but in the very first - array-section-subscript, the array section could be non-contiguous. - Note that OpenACC does accept these kinds of non-contiguous pointer - based arrays. */ + array-section-subscript, the array section could be non-contiguous. */ if (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_AFFINITY && OMP_CLAUSE_CODE (c) != OMP_CLAUSE_DEPEND && TREE_CODE (TREE_CHAIN (t)) == TREE_LIST) { - if (ort == C_ORT_ACC) - /* Note that OpenACC does accept these kinds of non-contiguous - pointer based arrays. */ - non_contiguous = true; - else + /* If any prior dimension has a non-one length, then deem this + array section as non-contiguous. */ + for (tree d = TREE_CHAIN (t); TREE_CODE (d) == TREE_LIST; + d = TREE_CHAIN (d)) { - /* If any prior dimension has a non-one length, then deem this - array section as non-contiguous. */ - for (tree d = TREE_CHAIN (t); TREE_CODE (d) == TREE_LIST; - d = TREE_CHAIN (d)) + tree d_length = TREE_VALUE (d); + if (d_length == NULL_TREE || !integer_onep (d_length)) { - tree d_length = TREE_VALUE (d); - if (d_length == NULL_TREE || !integer_onep (d_length)) + if (ort == C_ORT_ACC) { + while (TREE_CODE (d) == TREE_LIST) + d = TREE_CHAIN (d); + if (DECL_P (d)) + { + /* Note that OpenACC does accept these kinds of + non-contiguous pointer based arrays. */ + non_contiguous = true; + break; + } error_at (OMP_CLAUSE_LOCATION (c), - "array section is not contiguous in %qs clause", + "base-pointer expression in %qs clause not " + "supported for non-contiguous arrays", omp_clause_code_name[OMP_CLAUSE_CODE (c)]); return error_mark_node; } + + error_at (OMP_CLAUSE_LOCATION (c), + "array section is not contiguous in %qs clause", + omp_clause_code_name[OMP_CLAUSE_CODE (c)]); + return error_mark_node; } } }
reply other threads:[~2021-08-19 11:43 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210819114327.D23D63858438@sourceware.org \ --to=cltang@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).