From: Richard Sandiford <richard.sandiford@arm.com>
Date: Tue, 28 Aug 2018 10:42:42 +0000 (+0000)
Subject: Fix unguarded use of tree_to_shwi in tree-ssa-sccvn.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4ec4324d0f2425ad64540d4c4d8d29f8e8077c3d;p=gcc.git

Fix unguarded use of tree_to_shwi in tree-ssa-sccvn.c

Fixes many testsuite failures for SVE.

2018-08-28  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-ssa-sccvn.c (fully_constant_vn_reference_p): Fix unguarded
	use of tree_to_shwi.  Remove duplicated test for the size being
	a whole number of bytes.

From-SVN: r263914
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a357b4ba448..0e2f9d013c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-28  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-ssa-sccvn.c (fully_constant_vn_reference_p): Fix unguarded
+	use of tree_to_shwi.  Remove duplicated test for the size being
+	a whole number of bytes.
+
 2018-08-28  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/87117
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 9277de0cbdc..39ad0c595ac 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -1409,16 +1409,16 @@ fully_constant_vn_reference_p (vn_reference_t ref)
   /* Simplify reads from constants or constant initializers.  */
   else if (BITS_PER_UNIT == 8
 	   && COMPLETE_TYPE_P (ref->type)
-	   && is_gimple_reg_type (ref->type)
-	   && (!INTEGRAL_TYPE_P (ref->type)
-	       || TYPE_PRECISION (ref->type) % BITS_PER_UNIT == 0))
+	   && is_gimple_reg_type (ref->type))
     {
       poly_int64 off = 0;
       HOST_WIDE_INT size;
       if (INTEGRAL_TYPE_P (ref->type))
 	size = TYPE_PRECISION (ref->type);
-      else
+      else if (tree_fits_shwi_p (TYPE_SIZE (ref->type)))
 	size = tree_to_shwi (TYPE_SIZE (ref->type));
+      else
+	return NULL_TREE;
       if (size % BITS_PER_UNIT != 0
 	  || size > MAX_BITSIZE_MODE_ANY_MODE)
 	return NULL_TREE;