From: Marek Polacek <polacek@redhat.com>
Date: Tue, 21 Mar 2017 16:21:14 +0000 (+0000)
Subject: re PR tree-optimization/80109 (ICE in get_range_info, at tree-ssanames.c:375)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edc1747f1f60974e9005c3ef992b818007666655;p=gcc.git

re PR tree-optimization/80109 (ICE in get_range_info, at tree-ssanames.c:375)

	PR tree-optimization/80109
	* gimple-ssa-warn-alloca.c (alloca_call_type): Only call get_range_info
	on INTEGRAL_TYPE_P.

	* gcc.dg/Walloca-14.c: New test.

Co-Authored-By: Martin Sebor <msebor@redhat.com>

From-SVN: r246325
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03b2a419331..2998017abd7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-21  Marek Polacek  <polacek@redhat.com>
+	    Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/80109
+	* gimple-ssa-warn-alloca.c (alloca_call_type): Only call get_range_info
+	on INTEGRAL_TYPE_P.
+
 2017-03-21  Jakub Jelinek  <jakub@redhat.com>
 	    Segher Boessenkool  <segher@kernel.crashing.org>
 
diff --git a/gcc/gimple-ssa-warn-alloca.c b/gcc/gimple-ssa-warn-alloca.c
index b940efa910c..ec95cc6ddd8 100644
--- a/gcc/gimple-ssa-warn-alloca.c
+++ b/gcc/gimple-ssa-warn-alloca.c
@@ -327,11 +327,20 @@ alloca_call_type (gimple *stmt, bool is_vla, tree *invalid_casted_type)
 	      // away with better range information.  But it gets
 	      // most of the cases.
 	      gimple *def = SSA_NAME_DEF_STMT (len);
-	      if (gimple_assign_cast_p (def)
-		  && TYPE_UNSIGNED (TREE_TYPE (gimple_assign_rhs1 (def))))
+	      if (gimple_assign_cast_p (def))
 		{
-		  len_casted = gimple_assign_rhs1 (def);
-		  range_type = get_range_info (len_casted, &min, &max);
+		  tree rhs1 = gimple_assign_rhs1 (def);
+		  tree rhs1type = TREE_TYPE (rhs1);
+
+		  // Bail if the argument type is not valid.
+		  if (!INTEGRAL_TYPE_P (rhs1type))
+		    return alloca_type_and_limit (ALLOCA_OK);
+
+		  if (TYPE_UNSIGNED (rhs1type))
+		    {
+		      len_casted = rhs1;
+		      range_type = get_range_info (len_casted, &min, &max);
+		    }
 		}
 	      // An unknown range or a range of the entire domain is
 	      // really no range at all.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a87efc180d..854726236e0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-21  Marek Polacek  <polacek@redhat.com>
+	    Martin Sebor  <msebor@redhat.com>
+
+	PR tree-optimization/80109
+	* gcc.dg/Walloca-14.c: New test.
+
 2017-03-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/80125
diff --git a/gcc/testsuite/gcc.dg/Walloca-14.c b/gcc/testsuite/gcc.dg/Walloca-14.c
new file mode 100644
index 00000000000..6ff2e7f29c5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Walloca-14.c
@@ -0,0 +1,12 @@
+/* PR tree-optimization/80109 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -Walloca-larger-than=126812070" } */
+
+void
+g (int *p)
+{
+  extern void f (void *);
+
+  void *q = __builtin_alloca (p); /* { dg-warning "passing argument 1" } */
+  f (q);
+}