From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 13 Dec 2014 08:57:05 +0000 (+0100)
Subject: backport: re PR tree-optimization/64269 (ICE with -O3 enabled on Ubuntu 14.04)
X-Git-Tag: releases/gcc-4.8.4~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c6563bb7d24d5ebb7485b11ee8cdf48ae76a00;p=thirdparty%2Fgcc.git

backport: re PR tree-optimization/64269 (ICE with -O3 enabled on Ubuntu 14.04)

	Backported from mainline
	2014-12-12  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/64269
	* tree-ssa-forwprop.c (simplify_builtin_call): Bail out if
	len2 or diff are too large.

	* gcc.c-torture/compile/pr64269.c: New test.

From-SVN: r218704
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5ff154ba543..fc3b03ef2cff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from mainline
+	2014-12-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/64269
+	* tree-ssa-forwprop.c (simplify_builtin_call): Bail out if
+	len2 or diff are too large.
+
 2014-12-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* doc/md.texi (Insn Lengths): Fix description of (pc).
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5aaa8b7014e5..f5b4e957015d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from mainline
+	2014-12-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/64269
+	* gcc.c-torture/compile/pr64269.c: New test.
+
 2014-12-10  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr64269.c b/gcc/testsuite/gcc.c-torture/compile/pr64269.c
new file mode 100644
index 000000000000..640758d3fefb
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr64269.c
@@ -0,0 +1,9 @@
+/* PR tree-optimization/64269 */
+
+void
+foo (char *p)
+{
+  __SIZE_TYPE__ s = ~(__SIZE_TYPE__)0;
+  *p = 0;
+  __builtin_memset (p + 1, 0, s);
+}
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index edcf92918b7d..d617f5b625d4 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -1438,7 +1438,8 @@ simplify_builtin_call (gimple_stmt_iterator *gsi_p, tree callee2)
 	  use_operand_p use_p;
 
 	  if (!host_integerp (val2, 0)
-	      || !host_integerp (len2, 1))
+	      || !host_integerp (len2, 1)
+	      || compare_tree_int (len2, 1024) == 1)
 	    break;
 	  if (is_gimple_call (stmt1))
 	    {
@@ -1504,7 +1505,8 @@ simplify_builtin_call (gimple_stmt_iterator *gsi_p, tree callee2)
 	     is not constant, or is bigger than memcpy length, bail out.  */
 	  if (diff == NULL
 	      || !host_integerp (diff, 1)
-	      || tree_int_cst_lt (len1, diff))
+	      || tree_int_cst_lt (len1, diff)
+	      || compare_tree_int (diff, 1024) == 1)
 	    break;
 
 	  /* Use maximum of difference plus memset length and memcpy length