From 05be68f3852f9fc0cf7479ee90dd535210fc3a06 Mon Sep 17 00:00:00 2001
From: pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 23 May 2007 01:17:14 +0000
Subject: [PATCH] 2007-05-22 Andrew Pinski
<andrew_pinski@playstation.sony.com>
PR middle-end/31095
* builtins.c (expand_builtin_memmove_args): Strip nops that don't
change the type before looking for a COMPOUND_EXPR.
2007-05-22 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR middle-end/31095
* gcc.c-torture/compile/bcopy-1.c: New testcase.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124975 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 ++++++
gcc/builtins.c | 1 +
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gcc.c-torture/compile/bcopy-1.c | 14 ++++++++++++++
4 files changed, 26 insertions(+)
create mode 100644 gcc/testsuite/gcc.c-torture/compile/bcopy-1.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 484a6e81c430..c882b1e54bbf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-22 Andrew Pinski <andrew_pinski@playstation.sony.com>
+
+ PR middle-end/31095
+ * builtins.c (expand_builtin_memmove_args): Strip nops that don't
+ change the type before looking for a COMPOUND_EXPR.
+
2007-05-22 Ian Lance Taylor <iant@google.com>
* lower-subreg.c (decompose_multiword_subregs): If we change an
diff --git a/gcc/builtins.c b/gcc/builtins.c
index b4f61868205c..80f89788632f 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3485,6 +3485,7 @@ expand_builtin_memmove_args (tree dest, tree src, tree len,
if (result)
{
+ STRIP_TYPE_NOPS (result);
while (TREE_CODE (result) == COMPOUND_EXPR)
{
expand_expr (TREE_OPERAND (result, 0), const0_rtx, VOIDmode,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c4e1a202fe1..bf555817b5b6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-22 Andrew Pinski <andrew_pinski@playstation.sony.com>
+
+ PR middle-end/31095
+ * gcc.c-torture/compile/bcopy-1.c: New testcase.
+
2007-05-22 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR middle-end/31606
diff --git a/gcc/testsuite/gcc.c-torture/compile/bcopy-1.c b/gcc/testsuite/gcc.c-torture/compile/bcopy-1.c
new file mode 100644
index 000000000000..5d3a882c8677
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/bcopy-1.c
@@ -0,0 +1,14 @@
+/* PR middle-end/31095, expand_builtin_memmove_args forgot to take into
+ account that tree folding of builtins can add an extra NOP_EXPR. */
+
+struct timeval
+{
+ int tv_sec;
+ int tv_usec;
+};
+void
+capture_next_packet (void)
+{
+ struct timeval past, now, then;
+ __builtin_bcopy (&then, &past, sizeof (then));
+}
--
GitLab