From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id C6B553839821; Thu, 17 Jun 2021 05:59:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C6B553839821 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-8590] fold-const: Fix up fold_read_from_vector [PR100887] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: d9f75e8a73b1b69b8f709b56296b4a9751c50ef0 X-Git-Newrev: ce1dd5e70514fde8e34c86ab45a3c55e84d3c5b7 Message-Id: <20210617055923.C6B553839821@sourceware.org> Date: Thu, 17 Jun 2021 05:59: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: Thu, 17 Jun 2021 05:59:23 -0000 https://gcc.gnu.org/g:ce1dd5e70514fde8e34c86ab45a3c55e84d3c5b7 commit r11-8590-gce1dd5e70514fde8e34c86ab45a3c55e84d3c5b7 Author: Jakub Jelinek Date: Mon Jun 7 09:28:31 2021 +0200 fold-const: Fix up fold_read_from_vector [PR100887] The callers of fold_read_from_vector expect that the index they pass is an index of an element in the vector and the function does that most of the time. But we allow CONSTRUCTORs with VECTOR_TYPE to have VECTOR_TYPE elements and in that case every CONSTRUCTOR element represents not just one index (with the exception of V1 vectors), but multiple. So returning zero vector if i >= CONSTRUCTOR_NELTS or returning some CONSTRUCTOR_ELT's value might not be what the callers expect. Fixed by punting if the first element has vector type. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? In theory we could instead recurse (and assert that for CONSTRUCTORs of vector elements we have always all elements specified like tree-cfg.c verifies?) after adjusting the index appropriately. 2021-06-07 Jakub Jelinek PR target/100887 * fold-const.c (fold_read_from_vector): Return NULL if trying to read from a CONSTRUCTOR with vector type elements. (cherry picked from commit e1521b170b44be5cd5d36a98b6b760457b68f566) Diff: --- gcc/fold-const.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 2834278fd76..a92406af79c 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -15479,6 +15479,9 @@ fold_read_from_vector (tree arg, poly_uint64 idx) return VECTOR_CST_ELT (arg, i); else if (TREE_CODE (arg) == CONSTRUCTOR) { + if (CONSTRUCTOR_NELTS (arg) + && VECTOR_TYPE_P (TREE_TYPE (CONSTRUCTOR_ELT (arg, 0)->value))) + return NULL_TREE; if (i >= CONSTRUCTOR_NELTS (arg)) return build_zero_cst (TREE_TYPE (TREE_TYPE (arg))); return CONSTRUCTOR_ELT (arg, i)->value;