From patchwork Thu Sep 14 11:13:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 112536 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp615964qgf; Thu, 14 Sep 2017 04:13:30 -0700 (PDT) X-Received: by 10.101.82.8 with SMTP id o8mr20953954pgp.404.1505387610604; Thu, 14 Sep 2017 04:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505387610; cv=none; d=google.com; s=arc-20160816; b=kH44eNn+g4jQluoxBtidAofbvumGgisTzbAya7KYEAp8LBdfyyBsIheV72W33xwDfB 8n6xWpsbOQQ1IIcUdJYqk47cPyolPFKXdMhjBM565i7WHROow71xw+L/w/8Rng3nf0PA 8cq4zri1c8kdRVbEp1SopLsoFYfi9WP7SyKEqEqU6dkvYD+pLvcVgxJB3aqxZCXzhbsE TEhmj+9IqLkr9wJ+hoP2IryPvM4b+ouoG+eYtY/u9OegTaNFQDaQ5y2tbZoHPSpKVlSS nlKhN9rHiVKd6acOgzWzoLQAP9bqOwaOWm3RVsY9UYonwvj25nQAK4viuKFVRPcJcrNj oSJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:message-id:date:subject:mail-followup-to:to :from:delivered-to:sender:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=dMJsG+4I9qb6x33rraHscdNdGc4H13fQNJphUSPeCTU=; b=EZfSt/JMGBU5zp5vZptqKcgzEcvokir0CywUdFRzk6O48bBTboS+ICZPIBVc+RkHVX nMBsXNw7OhBr/7WewpCFMJrxF/ORPy7Xo044zdmahIVuXswDtIdJmSOk1eUZyUingYxr mod5DaLZA5uJiiQmu2UvoBASXzKAo1gOF5TtpLkzWVEVolaXxxFMEwHtgg0tfVUdobhu 6Rg3vk7vyimJrv+cCZgjkn3uBVfuAclie+kvBaXIvUMoDSbJQHj129qtgjIBDTre339I gFt7cy0Hb0ZJMNR82p0AyDPfD/MUXVw07tyl3I/JiRuE8t8R4rGLrmdwWOOgelY4bcVc TfPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=B4Tq/UyC; spf=pass (google.com: domain of gcc-patches-return-462117-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-462117-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id a5si1656484plh.802.2017.09.14.04.13.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Sep 2017 04:13:30 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-462117-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=B4Tq/UyC; spf=pass (google.com: domain of gcc-patches-return-462117-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-462117-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=dS9Ir5IAE3ahSRtfk9Ohas+fHGNtSzlTZTHR4cJQ9c+JG2H4zpLlx rxdqoCqLuGWUFJc5yv6aLFZhAKoyw+eJCnPgMpUAovjfrTiiFa7RH8H12miIs8uU cANupMvpvSPzyjkBT8l27WtwMYQHelcLWuwD/sfgbPegYecgldw/3Q= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=o6fc6m7s9N0u47anGxV4k19uxbg=; b=B4Tq/UyCwZfKRXDxz3uH sNPBecp4T6LzdHbWzsq5PcvU00AjnHYFTu947ba3PhlhJ2JM5Nn2n75BwdZTN8sf pHUfYcFxUxEEkh8BDlOhtKMP9SdZiPVRPjcISf1uBILk9tlEA/WLwnsOpGIuRGiN M4boQkl04t9MGTxyDrT0nRc= Received: (qmail 28693 invoked by alias); 14 Sep 2017 11:13:16 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 28054 invoked by uid 89); 14 Sep 2017 11:13:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=ind X-HELO: mail-wr0-f170.google.com Received: from mail-wr0-f170.google.com (HELO mail-wr0-f170.google.com) (209.85.128.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 14 Sep 2017 11:13:07 +0000 Received: by mail-wr0-f170.google.com with SMTP id a43so5636960wrc.0 for ; Thu, 14 Sep 2017 04:13:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:mail-followup-to:subject:date:message-id :user-agent:mime-version; bh=dMJsG+4I9qb6x33rraHscdNdGc4H13fQNJphUSPeCTU=; b=s+cPvRkm4TJI2CDs52Xcti05G0romNMXBCwGteDLG4AAgN2F5tVnrCVy2Vth7ai0/k 9fDvpXMepMIWsOIY39ktop73IkvIwWQm6pB/hg4PjjSij/BEp4LSD0h8UxR4A6ZtrXF8 VVvAJJS+PdRmwsFJhcZWfv5tFumzgZt0VzAKzdFW72BWsVI0nysyLJlftjprSOXpmTPW RzHCOW+xZdm27ooIqOk1vSoMls3WWROeDjXSHAQ/ONgaMnT4mnJEsxuBSikwcuVMX07j AIb1RRKlKf3nWFqaYUVks2KPrMg6yPjHchB0EGe2oD/DL7/M/pxkMSoownI8eSsCf5XZ cgdQ== X-Gm-Message-State: AHPjjUh5tpyyKO1HlGd8qDacHAXfWz9SdI4rVyNJBoqDCgGmtXcXAtgd 8mZNtRrcorXZlC9C1JSVwA== X-Google-Smtp-Source: ADKCNb4Qt+A6gGoqrO1yLdiBJlnyulrH6aZSaINpUk93KvXpevolCfbrklBAcuwt0t1ncbDTo9HH9Q== X-Received: by 10.223.154.228 with SMTP id a91mr17777229wrc.246.1505387584512; Thu, 14 Sep 2017 04:13:04 -0700 (PDT) Received: from localhost (92.40.248.70.threembb.co.uk. [92.40.248.70]) by smtp.gmail.com with ESMTPSA id 6sm6833600wru.33.2017.09.14.04.13.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Sep 2017 04:13:03 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@linaro.org Subject: Store VECTOR_CST_NELTS directly in tree_node Date: Thu, 14 Sep 2017 12:13:00 +0100 Message-ID: <87h8w5y1mr.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Previously VECTOR_CST_NELTS (t) read the number of elements from TYPE_VECTOR_SUBPARTS (TREE_TYPE (t)). There were two ways of handling this with variable TYPE_VECTOR_SUBPARTS: either forcibly convert the number to a constant (which is doable) or store the number directly in the VECTOR_CST. The latter seemed better, since it involves less pointer chasing and since the tree_node u field is otherwise unused for VECTOR_CST. It would still be easy to switch to the former in future if we need to free up the field for someting else. The patch also changes various bits of VECTOR_CST code to use VECTOR_CST_NELTS instead of TYPE_VECTOR_SUBPARTS when iterating over VECTOR_CST_ELTs. Also, when the two are checked for equality, the patch prefers to read VECTOR_CST_NELTS (which must be constant) and check against TYPE_VECTOR_SUBPARTS, instead of the other way around. Tested on aarch64-linux-gnu, x86_64-linux-gnu and powerpc64le-linux-gnu. OK to install? Richard 2017-09-14 Richard Sandiford Alan Hayward David Sherwood gcc/ * tree-core.h (tree_base::u): Add an "nelts" field. (tree_vector): Use VECTOR_CST_NELTS as the length. * tree.c (tree_size): Likewise. (make_vector): Initialize VECTOR_CST_NELTS. * tree.h (VECTOR_CST_NELTS): Use the u.nelts field. * cfgexpand.c (expand_debug_expr): Use VECTOR_CST_NELTS instead of TYPE_VECTOR_SUBPARTS. * expr.c (const_vector_mask_from_tree): Consistently use "units" as the number of units, setting it from VECTOR_CST_NELTS. (const_vector_from_tree): Likewise. * fold-const.c (negate_expr_p): Use VECTOR_CST_NELTS instead of TYPE_VECTOR_SUBPARTS for the number of elements in a VECTOR_CST. (fold_negate_expr_1): Likewise. (fold_convert_const): Likewise. (const_binop): Likewise. Differentiate the number of output and input elements. (const_unop): Likewise. (fold_ternary_loc): Use VECTOR_CST_NELTS for the number of elements in a VECTOR_CST, asserting that it is the same as TYPE_VECTOR_SUBPARTS in cases that did the opposite. Index: gcc/tree-core.h =================================================================== --- gcc/tree-core.h 2017-08-21 10:42:05.815630531 +0100 +++ gcc/tree-core.h 2017-09-14 11:23:57.004041291 +0100 @@ -975,6 +975,9 @@ struct GTY(()) tree_base { /* VEC length. This field is only used with TREE_VEC. */ int length; + /* Number of elements. This field is only used with VECTOR_CST. */ + unsigned int nelts; + /* SSA version number. This field is only used with SSA_NAME. */ unsigned int version; @@ -1326,7 +1329,7 @@ struct GTY(()) tree_complex { struct GTY(()) tree_vector { struct tree_typed typed; - tree GTY ((length ("TYPE_VECTOR_SUBPARTS (TREE_TYPE ((tree)&%h))"))) elts[1]; + tree GTY ((length ("VECTOR_CST_NELTS ((tree) &%h)"))) elts[1]; }; struct GTY(()) tree_identifier { Index: gcc/tree.c =================================================================== --- gcc/tree.c 2017-09-11 17:10:38.700973860 +0100 +++ gcc/tree.c 2017-09-14 11:23:57.004947653 +0100 @@ -873,7 +873,7 @@ tree_size (const_tree node) case VECTOR_CST: return (sizeof (struct tree_vector) - + (TYPE_VECTOR_SUBPARTS (TREE_TYPE (node)) - 1) * sizeof (tree)); + + (VECTOR_CST_NELTS (node) - 1) * sizeof (tree)); case STRING_CST: return TREE_STRING_LENGTH (node) + offsetof (struct tree_string, str) + 1; @@ -1696,6 +1696,7 @@ make_vector (unsigned len MEM_STAT_DECL) TREE_SET_CODE (t, VECTOR_CST); TREE_CONSTANT (t) = 1; + VECTOR_CST_NELTS (t) = len; return t; } Index: gcc/tree.h =================================================================== --- gcc/tree.h 2017-08-30 12:19:19.721220029 +0100 +++ gcc/tree.h 2017-09-14 11:23:57.004947653 +0100 @@ -1026,7 +1026,7 @@ #define TREE_REALPART(NODE) (COMPLEX_CST #define TREE_IMAGPART(NODE) (COMPLEX_CST_CHECK (NODE)->complex.imag) /* In a VECTOR_CST node. */ -#define VECTOR_CST_NELTS(NODE) (TYPE_VECTOR_SUBPARTS (TREE_TYPE (NODE))) +#define VECTOR_CST_NELTS(NODE) (VECTOR_CST_CHECK (NODE)->base.u.nelts) #define VECTOR_CST_ELTS(NODE) (VECTOR_CST_CHECK (NODE)->vector.elts) #define VECTOR_CST_ELT(NODE,IDX) (VECTOR_CST_CHECK (NODE)->vector.elts[IDX]) Index: gcc/cfgexpand.c =================================================================== --- gcc/cfgexpand.c 2017-09-11 22:30:14.149035751 +0100 +++ gcc/cfgexpand.c 2017-09-14 11:23:57.002228567 +0100 @@ -4921,12 +4921,12 @@ expand_debug_expr (tree exp) case VECTOR_CST: { - unsigned i; + unsigned i, nelts; - op0 = gen_rtx_CONCATN - (mode, rtvec_alloc (TYPE_VECTOR_SUBPARTS (TREE_TYPE (exp)))); + nelts = VECTOR_CST_NELTS (exp); + op0 = gen_rtx_CONCATN (mode, rtvec_alloc (nelts)); - for (i = 0; i < VECTOR_CST_NELTS (exp); ++i) + for (i = 0; i < nelts; ++i) { op1 = expand_debug_expr (VECTOR_CST_ELT (exp, i)); if (!op1) Index: gcc/expr.c =================================================================== --- gcc/expr.c 2017-09-12 14:27:14.527325485 +0100 +++ gcc/expr.c 2017-09-14 11:23:57.003134929 +0100 @@ -11700,18 +11700,17 @@ try_tablejump (tree index_type, tree ind const_vector_mask_from_tree (tree exp) { rtvec v; - unsigned i; - int units; + unsigned i, units; tree elt; machine_mode inner, mode; mode = TYPE_MODE (TREE_TYPE (exp)); - units = GET_MODE_NUNITS (mode); + units = VECTOR_CST_NELTS (exp); inner = GET_MODE_INNER (mode); v = rtvec_alloc (units); - for (i = 0; i < VECTOR_CST_NELTS (exp); ++i) + for (i = 0; i < units; ++i) { elt = VECTOR_CST_ELT (exp, i); @@ -11756,8 +11755,7 @@ const_scalar_mask_from_tree (scalar_int_ const_vector_from_tree (tree exp) { rtvec v; - unsigned i; - int units; + unsigned i, units; tree elt; machine_mode inner, mode; @@ -11769,12 +11767,12 @@ const_vector_from_tree (tree exp) if (VECTOR_BOOLEAN_TYPE_P (TREE_TYPE (exp))) return const_vector_mask_from_tree (exp); - units = GET_MODE_NUNITS (mode); + units = VECTOR_CST_NELTS (exp); inner = GET_MODE_INNER (mode); v = rtvec_alloc (units); - for (i = 0; i < VECTOR_CST_NELTS (exp); ++i) + for (i = 0; i < units; ++i) { elt = VECTOR_CST_ELT (exp, i); Index: gcc/fold-const.c =================================================================== --- gcc/fold-const.c 2017-09-06 20:47:38.353833985 +0100 +++ gcc/fold-const.c 2017-09-14 11:23:57.004041291 +0100 @@ -410,7 +410,7 @@ negate_expr_p (tree t) if (FLOAT_TYPE_P (TREE_TYPE (type)) || TYPE_OVERFLOW_WRAPS (type)) return true; - int count = TYPE_VECTOR_SUBPARTS (type), i; + int count = VECTOR_CST_NELTS (t), i; for (i = 0; i < count; i++) if (!negate_expr_p (VECTOR_CST_ELT (t, i))) @@ -564,7 +564,7 @@ fold_negate_expr_1 (location_t loc, tree case VECTOR_CST: { - int count = TYPE_VECTOR_SUBPARTS (type), i; + int count = VECTOR_CST_NELTS (t), i; tree *elts = XALLOCAVEC (tree, count); for (i = 0; i < count; i++) @@ -1413,7 +1413,7 @@ const_binop (enum tree_code code, tree a && TREE_CODE (arg2) == VECTOR_CST) { tree type = TREE_TYPE (arg1); - int count = TYPE_VECTOR_SUBPARTS (type), i; + int count = VECTOR_CST_NELTS (arg1), i; tree *elts = XALLOCAVEC (tree, count); for (i = 0; i < count; i++) @@ -1437,7 +1437,7 @@ const_binop (enum tree_code code, tree a && TREE_CODE (arg2) == INTEGER_CST) { tree type = TREE_TYPE (arg1); - int count = TYPE_VECTOR_SUBPARTS (type), i; + int count = VECTOR_CST_NELTS (arg1), i; tree *elts = XALLOCAVEC (tree, count); for (i = 0; i < count; i++) @@ -1481,21 +1481,24 @@ const_binop (enum tree_code code, tree t case VEC_PACK_TRUNC_EXPR: case VEC_PACK_FIX_TRUNC_EXPR: { - unsigned int nelts = TYPE_VECTOR_SUBPARTS (type), i; tree *elts; + unsigned int out_nelts, in_nelts, i; - gcc_assert (TYPE_VECTOR_SUBPARTS (TREE_TYPE (arg1)) == nelts / 2 - && TYPE_VECTOR_SUBPARTS (TREE_TYPE (arg2)) == nelts / 2); if (TREE_CODE (arg1) != VECTOR_CST || TREE_CODE (arg2) != VECTOR_CST) return NULL_TREE; - elts = XALLOCAVEC (tree, nelts); + in_nelts = VECTOR_CST_NELTS (arg1); + out_nelts = in_nelts * 2; + gcc_assert (in_nelts == VECTOR_CST_NELTS (arg2) + && out_nelts == TYPE_VECTOR_SUBPARTS (type)); + + elts = XALLOCAVEC (tree, out_nelts); if (!vec_cst_ctor_to_array (arg1, elts) - || !vec_cst_ctor_to_array (arg2, elts + nelts / 2)) + || !vec_cst_ctor_to_array (arg2, elts + in_nelts)) return NULL_TREE; - for (i = 0; i < nelts; i++) + for (i = 0; i < out_nelts; i++) { elts[i] = fold_convert_const (code == VEC_PACK_TRUNC_EXPR ? NOP_EXPR : FIX_TRUNC_EXPR, @@ -1512,33 +1515,35 @@ const_binop (enum tree_code code, tree t case VEC_WIDEN_MULT_EVEN_EXPR: case VEC_WIDEN_MULT_ODD_EXPR: { - unsigned int nelts = TYPE_VECTOR_SUBPARTS (type); - unsigned int out, ofs, scale; + unsigned int out_nelts, in_nelts, out, ofs, scale; tree *elts; - gcc_assert (TYPE_VECTOR_SUBPARTS (TREE_TYPE (arg1)) == nelts * 2 - && TYPE_VECTOR_SUBPARTS (TREE_TYPE (arg2)) == nelts * 2); if (TREE_CODE (arg1) != VECTOR_CST || TREE_CODE (arg2) != VECTOR_CST) return NULL_TREE; - elts = XALLOCAVEC (tree, nelts * 4); + in_nelts = VECTOR_CST_NELTS (arg1); + out_nelts = in_nelts / 2; + gcc_assert (in_nelts == VECTOR_CST_NELTS (arg2) + && out_nelts == TYPE_VECTOR_SUBPARTS (type)); + + elts = XALLOCAVEC (tree, in_nelts * 2); if (!vec_cst_ctor_to_array (arg1, elts) - || !vec_cst_ctor_to_array (arg2, elts + nelts * 2)) + || !vec_cst_ctor_to_array (arg2, elts + in_nelts)) return NULL_TREE; if (code == VEC_WIDEN_MULT_LO_EXPR) - scale = 0, ofs = BYTES_BIG_ENDIAN ? nelts : 0; + scale = 0, ofs = BYTES_BIG_ENDIAN ? out_nelts : 0; else if (code == VEC_WIDEN_MULT_HI_EXPR) - scale = 0, ofs = BYTES_BIG_ENDIAN ? 0 : nelts; + scale = 0, ofs = BYTES_BIG_ENDIAN ? 0 : out_nelts; else if (code == VEC_WIDEN_MULT_EVEN_EXPR) scale = 1, ofs = 0; else /* if (code == VEC_WIDEN_MULT_ODD_EXPR) */ scale = 1, ofs = 1; - for (out = 0; out < nelts; out++) + for (out = 0; out < out_nelts; out++) { unsigned int in1 = (out << scale) + ofs; - unsigned int in2 = in1 + nelts * 2; + unsigned int in2 = in1 + in_nelts; tree t1, t2; t1 = fold_convert_const (NOP_EXPR, TREE_TYPE (type), elts[in1]); @@ -1671,28 +1676,31 @@ const_unop (enum tree_code code, tree ty case VEC_UNPACK_FLOAT_LO_EXPR: case VEC_UNPACK_FLOAT_HI_EXPR: { - unsigned int nelts = TYPE_VECTOR_SUBPARTS (type), i; + unsigned int out_nelts, in_nelts, i; tree *elts; enum tree_code subcode; - gcc_assert (TYPE_VECTOR_SUBPARTS (TREE_TYPE (arg0)) == nelts * 2); if (TREE_CODE (arg0) != VECTOR_CST) return NULL_TREE; - elts = XALLOCAVEC (tree, nelts * 2); + in_nelts = VECTOR_CST_NELTS (arg0); + out_nelts = in_nelts / 2; + gcc_assert (out_nelts == TYPE_VECTOR_SUBPARTS (type)); + + elts = XALLOCAVEC (tree, in_nelts); if (!vec_cst_ctor_to_array (arg0, elts)) return NULL_TREE; if ((!BYTES_BIG_ENDIAN) ^ (code == VEC_UNPACK_LO_EXPR || code == VEC_UNPACK_FLOAT_LO_EXPR)) - elts += nelts; + elts += out_nelts; if (code == VEC_UNPACK_LO_EXPR || code == VEC_UNPACK_HI_EXPR) subcode = NOP_EXPR; else subcode = FLOAT_EXPR; - for (i = 0; i < nelts; i++) + for (i = 0; i < out_nelts; i++) { elts[i] = fold_convert_const (subcode, TREE_TYPE (type), elts[i]); if (elts[i] == NULL_TREE || !CONSTANT_CLASS_P (elts[i])) @@ -1712,7 +1720,7 @@ const_unop (enum tree_code code, tree ty if (TREE_CODE (arg0) != VECTOR_CST) return NULL_TREE; - nelts = TYPE_VECTOR_SUBPARTS (TREE_TYPE (arg0)); + nelts = VECTOR_CST_NELTS (arg0); elts = XALLOCAVEC (tree, nelts); if (!vec_cst_ctor_to_array (arg0, elts)) @@ -2153,7 +2161,7 @@ fold_convert_const (enum tree_code code, if (TREE_CODE (arg1) == VECTOR_CST && TYPE_VECTOR_SUBPARTS (type) == VECTOR_CST_NELTS (arg1)) { - int len = TYPE_VECTOR_SUBPARTS (type); + int len = VECTOR_CST_NELTS (arg1); tree elttype = TREE_TYPE (type); tree *v = XALLOCAVEC (tree, len); for (int i = 0; i < len; ++i) @@ -11311,9 +11319,9 @@ fold_ternary_loc (location_t loc, enum t && (TREE_CODE (arg2) == VECTOR_CST || TREE_CODE (arg2) == CONSTRUCTOR)) { - unsigned int nelts = TYPE_VECTOR_SUBPARTS (type), i; + unsigned int nelts = VECTOR_CST_NELTS (arg0), i; unsigned char *sel = XALLOCAVEC (unsigned char, nelts); - gcc_assert (nelts == VECTOR_CST_NELTS (arg0)); + gcc_assert (nelts == TYPE_VECTOR_SUBPARTS (type)); for (i = 0; i < nelts; i++) { tree val = VECTOR_CST_ELT (arg0, i); @@ -11642,7 +11650,7 @@ fold_ternary_loc (location_t loc, enum t case VEC_PERM_EXPR: if (TREE_CODE (arg2) == VECTOR_CST) { - unsigned int nelts = TYPE_VECTOR_SUBPARTS (type), i, mask, mask2; + unsigned int nelts = VECTOR_CST_NELTS (arg2), i, mask, mask2; unsigned char *sel = XALLOCAVEC (unsigned char, 2 * nelts); unsigned char *sel2 = sel + nelts; bool need_mask_canon = false; @@ -11655,7 +11663,7 @@ fold_ternary_loc (location_t loc, enum t mask2 = 2 * nelts - 1; mask = single_arg ? (nelts - 1) : mask2; - gcc_assert (nelts == VECTOR_CST_NELTS (arg2)); + gcc_assert (nelts == TYPE_VECTOR_SUBPARTS (type)); for (i = 0; i < nelts; i++) { tree val = VECTOR_CST_ELT (arg2, i); @@ -11766,9 +11774,9 @@ fold_ternary_loc (location_t loc, enum t return arg0; else { - tree *elts = XALLOCAVEC (tree, TYPE_VECTOR_SUBPARTS (type)); - memcpy (elts, VECTOR_CST_ELTS (arg0), - sizeof (tree) * TYPE_VECTOR_SUBPARTS (type)); + unsigned int nelts = VECTOR_CST_NELTS (arg0); + tree *elts = XALLOCAVEC (tree, nelts); + memcpy (elts, VECTOR_CST_ELTS (arg0), sizeof (tree) * nelts); elts[k] = arg1; return build_vector (type, elts); }