From 0e62d8da8abc63fed2972043163030fd5b27df22 Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 6 Feb 2002 19:37:31 +0000
Subject: [PATCH] PR c/5420: * c-common.c (c_unsafe_for_reeval):
Make COMPOUND_LITERAL_EXPR unsafe for reevaluation.
* gcc.c-torture/execute/20020206-2.c: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49550 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 6 +++++
gcc/c-common.c | 6 +++--
gcc/testsuite/ChangeLog | 2 ++
.../gcc.c-torture/execute/20020206-2.c | 24 +++++++++++++++++++
4 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 gcc/testsuite/gcc.c-torture/execute/20020206-2.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86fc06296935..96baa91fc6cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-06 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/5420:
+ * c-common.c (c_unsafe_for_reeval): Make COMPOUND_LITERAL_EXPR
+ unsafe for reevaluation.
+
2002-02-06 Jakub Jelinek <jakub@redhat.com>
PR c/5482:
diff --git a/gcc/c-common.c b/gcc/c-common.c
index dd535ed7365e..4b7946b41946 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -3567,8 +3567,10 @@ int
c_unsafe_for_reeval (exp)
tree exp;
{
- /* Statement expressions may not be reevaluated. */
- if (TREE_CODE (exp) == STMT_EXPR)
+ /* Statement expressions may not be reevaluated, likewise compound
+ literals. */
+ if (TREE_CODE (exp) == STMT_EXPR
+ || TREE_CODE (exp) == COMPOUND_LITERAL_EXPR)
return 2;
/* Walk all other expressions. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8cf3dc49e2bb..5c8a027d3cbd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -2,6 +2,8 @@
* gcc.c-torture/execute/20020206-1.c: New test.
+ * gcc.c-torture/execute/20020206-2.c: New test.
+
PR optimization/5429:
* gcc.c-torture/compile/20020206-1.c: New test.
diff --git a/gcc/testsuite/gcc.c-torture/execute/20020206-2.c b/gcc/testsuite/gcc.c-torture/execute/20020206-2.c
new file mode 100644
index 000000000000..097eb3055c1f
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20020206-2.c
@@ -0,0 +1,24 @@
+/* Origin: PR c/5420 from David Mosberger <davidm@hpl.hp.com>.
+ This testcase was miscompiled when tail call optimizing, because a
+ compound literal initialization was emitted only in the tail call insn
+ chain, not in the normal call insn chain. */
+
+typedef struct { unsigned short a; } A;
+
+extern void abort (void);
+extern void exit (int);
+
+void foo (unsigned int x)
+{
+ if (x != 0x800 && x != 0x810)
+ abort ();
+}
+
+int
+main (int argc, char **argv)
+{
+ int i;
+ for (i = 0; i < 2; ++i)
+ foo (((A) { ((!(i >> 4) ? 8 : 64 + (i >> 4)) << 8) + (i << 4) } ).a);
+ exit (0);
+}
--
GitLab