From 22518428af7aadf1ec1f5ba957e7ac4c8e9a6acb Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 8 Jan 2016 11:13:23 +0100
Subject: [PATCH] re PR tree-optimization/69172 (ICE in make_ssa_name_fn, at
tree-ssanames.c:266)
PR tree-optimization/69172
* gimple-fold.c (gimple_fold_builtin_memory_chk): Pass type to
gimple_build.
* gcc.dg/pr69172.c: New test.
From-SVN: r232155
---
gcc/ChangeLog | 6 +++++
gcc/gimple-fold.c | 3 ++-
gcc/testsuite/ChangeLog | 5 ++++
gcc/testsuite/gcc.dg/pr69172.c | 45 ++++++++++++++++++++++++++++++++++
4 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.dg/pr69172.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b9c6daf55fb5..ee2f4a9509d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-08 Jakub Jelinek <jakub@redhat.com>
+
+ PR tree-optimization/69172
+ * gimple-fold.c (gimple_fold_builtin_memory_chk): Pass type to
+ gimple_build.
+
2016-01-08 Thomas Preud'homme <thomas.preudhomme@arm.com>
PR tree-optimization/67781
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index f656502c7b52..2f379be4b28f 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -1710,7 +1710,8 @@ gimple_fold_builtin_memory_chk (gimple_stmt_iterator *gsi,
{
gimple_seq stmts = NULL;
len = gimple_convert_to_ptrofftype (&stmts, loc, len);
- tree temp = gimple_build (&stmts, loc, POINTER_PLUS_EXPR, dest, len);
+ tree temp = gimple_build (&stmts, loc, POINTER_PLUS_EXPR,
+ TREE_TYPE (dest), dest, len);
gsi_insert_seq_before (gsi, stmts, GSI_SAME_STMT);
replace_call_with_value (gsi, temp);
return true;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6b30af01e567..672a4961b096 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-08 Jakub Jelinek <jakub@redhat.com>
+
+ PR tree-optimization/69172
+ * gcc.dg/pr69172.c: New test.
+
2016-01-08 Thomas Preud'homme <thomas.preudhomme@arm.com>
PR tree-optimization/67781
diff --git a/gcc/testsuite/gcc.dg/pr69172.c b/gcc/testsuite/gcc.dg/pr69172.c
new file mode 100644
index 000000000000..c0e74633834c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr69172.c
@@ -0,0 +1,45 @@
+/* PR tree-optimization/69172 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int a;
+
+void *
+f1 (void)
+{
+ int *b = &a, *c = &a;
+ return __builtin___mempcpy_chk (b, c, sizeof (int), 0);
+}
+
+void *
+f2 (void)
+{
+ int *b = &a;
+ return __builtin___mempcpy_chk (b, b, sizeof (int), 0);
+}
+
+void *
+f3 (void)
+{
+ return __builtin___mempcpy_chk (&a, &a, sizeof (int), 0);
+}
+
+void *
+f4 (int x)
+{
+ int *b = &a, *c = &a;
+ return __builtin___mempcpy_chk (b, c, x, 0);
+}
+
+void *
+f5 (int x)
+{
+ int *b = &a;
+ return __builtin___mempcpy_chk (b, b, x, 0);
+}
+
+void *
+f6 (int x)
+{
+ return __builtin___mempcpy_chk (&a, &a, x, 0);
+}
--
GitLab