This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch for c/5105
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 17 Dec 2001 01:20:14 +0000 (GMT)
- Subject: Patch for c/5105
This patch fixes PR c/5105, where the initializer of a compound
literal wasn't being properly walked in tree inlining.
Bootstrapped with no regressions on i686-pc-linux-gnu. Applied to
mainline.
2001-12-17 Joseph S. Myers <jsm28@cam.ac.uk>
* c-common.def (COMPOUND_LITERAL_EXPR): Contain a DECL_STMT, not
a DECL directly.
* c-common.h (COMPOUND_LITERAL_EXPR_DECL_STMT): New.
(COMPOUND_LITERAL_EXPR_DECL): Adjust definition.
* c-decl.c (build_compound_literal): Put the decl inside a
DECL_STMT.
* doc/c-tree.texi (COMPOUND_LITERAL_EXPR): Update documentation.
Fixes PR c/5105.
testsuite:
2001-12-17 Joseph S. Myers <jsm28@cam.ac.uk>
* gcc.c-torture/compile/20011217-1.c: New test.
diff -rupN gcc.orig/c-common.def gcc/c-common.def
--- gcc.orig/c-common.def Tue Dec 4 22:50:11 2001
+++ gcc/c-common.def Sun Dec 16 21:30:45 2001
@@ -103,7 +103,8 @@ DEFTREECODE (CASE_LABEL, "case_label", '
DEFTREECODE (STMT_EXPR, "stmt_expr", 'e', 1)
/* A COMPOUND_LITERAL_EXPR represents a C99 compound literal. The
- COMPOND_LITERAL_EXPR_DECL is the decl for the anonymous object
- represented by the COMPOUND_LITERAL; the DECL_INITIAL of that
- decl is the CONSTRUCTOR that initializes the compound literal. */
+ COMPOND_LITERAL_EXPR_DECL_STMT is the a DECL_STMT containing the decl
+ for the anonymous object represented by the COMPOUND_LITERAL;
+ the DECL_INITIAL of that decl is the CONSTRUCTOR that initializes
+ the compound literal. */
DEFTREECODE (COMPOUND_LITERAL_EXPR, "compound_literal_expr", 'e', 1)
diff -rupN gcc.orig/c-common.h gcc/c-common.h
--- gcc.orig/c-common.h Fri Dec 14 18:43:22 2001
+++ gcc/c-common.h Sun Dec 16 21:31:47 2001
@@ -637,9 +637,11 @@ extern tree strip_array_types
the given label statement. */
#define LABEL_STMT_LABEL(NODE) TREE_OPERAND (LABEL_STMT_CHECK (NODE), 0)
-/* COMPOUND_LITERAL_EXPR accessor. */
-#define COMPOUND_LITERAL_EXPR_DECL(NODE) \
+/* COMPOUND_LITERAL_EXPR accessors. */
+#define COMPOUND_LITERAL_EXPR_DECL_STMT(NODE) \
TREE_OPERAND (COMPOUND_LITERAL_EXPR_CHECK (NODE), 0)
+#define COMPOUND_LITERAL_EXPR_DECL(NODE) \
+ DECL_STMT_DECL (COMPOUND_LITERAL_EXPR_DECL_STMT (NODE))
/* Nonzero if this SCOPE_STMT is for the beginning of a scope. */
#define SCOPE_BEGIN_P(NODE) \
diff -rupN gcc.orig/c-decl.c gcc/c-decl.c
--- gcc.orig/c-decl.c Sat Dec 15 12:33:47 2001
+++ gcc/c-decl.c Sun Dec 16 21:35:43 2001
@@ -3836,6 +3836,7 @@ build_compound_literal (type, init)
the COMPOUND_LITERAL_EXPR rather than added elsewhere as a DECL_STMT. */
tree decl = build_decl (VAR_DECL, NULL_TREE, type);
tree complit;
+ tree stmt;
DECL_EXTERNAL (decl) = 0;
TREE_PUBLIC (decl) = 0;
TREE_STATIC (decl) = (current_binding_level == global_binding_level);
@@ -3855,7 +3856,8 @@ build_compound_literal (type, init)
if (type == error_mark_node || !COMPLETE_TYPE_P (type))
return error_mark_node;
- complit = build1 (COMPOUND_LITERAL_EXPR, TREE_TYPE (decl), decl);
+ stmt = build_stmt (DECL_STMT, decl);
+ complit = build1 (COMPOUND_LITERAL_EXPR, TREE_TYPE (decl), stmt);
TREE_SIDE_EFFECTS (complit) = 1;
layout_decl (decl, 0);
diff -rupN gcc.orig/doc/c-tree.texi gcc/doc/c-tree.texi
--- gcc.orig/doc/c-tree.texi Thu Dec 6 01:58:00 2001
+++ gcc/doc/c-tree.texi Sun Dec 16 21:33:35 2001
@@ -2219,13 +2219,16 @@ Conceptually, before any initialization
storage is initialized to zero.
@item COMPOUND_LITERAL_EXPR
+@findex COMPOUND_LITERAL_EXPR_DECL_STMT
@findex COMPOUND_LITERAL_EXPR_DECL
These nodes represent ISO C99 compound literals. The
-@code{COMPOUND_LITERAL_EXPR_DECL} is an anonymous @code{VAR_DECL} for
+@code{COMPOUND_LITERAL_EXPR_DECL_STMT} is a @code{DECL_STMT}
+containing an anonymous @code{VAR_DECL} for
the unnamed object represented by the compound literal; the
@code{DECL_INITIAL} of that @code{VAR_DECL} is a @code{CONSTRUCTOR}
representing the brace-enclosed list of initializers in the compound
-literal.
+literal. That anonymous @code{VAR_DECL} can also be accessed directly
+by the @code{COMPOUND_LITERAL_EXPR_DECL} macro.
@item SAVE_EXPR
diff -rupN gcc.orig/testsuite/gcc.c-torture/compile/20011217-1.c gcc/testsuite/gcc.c-torture/compile/20011217-1.c
--- gcc.orig/testsuite/gcc.c-torture/compile/20011217-1.c Thu Jan 1 00:00:00 1970
+++ gcc/testsuite/gcc.c-torture/compile/20011217-1.c Sun Dec 16 20:55:58 2001
@@ -0,0 +1,20 @@
+/* Test that the initializer of a compound literal is properly walked
+ when tree inlining. */
+/* Origin: PR c/5105 from <aj@suse.de>. */
+
+typedef struct { long p; } pt;
+
+inline pt f (pt _p)
+{
+ long p = _p.p;
+
+ return (pt) { (p) };
+}
+
+static int mmap_mem (void)
+{
+ pt p;
+ p = f (p);
+
+ return 0;
+}
--
Joseph S. Myers
jsm28@cam.ac.uk