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:
* gcc.c-torture/compile/
20011217-1.c: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48085
138bc75d-0d04-0410-961f-
82ee72b054a4
+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.
+
2001-12-16 Aldy Hernandez <aldyh@redhat.com>
* config.gcc: Add powerpc-*-eabisimaltivec*.
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)
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) \
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);
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);
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
+2001-12-17 Joseph S. Myers <jsm28@cam.ac.uk>
+
+ * gcc.c-torture/compile/20011217-1.c: New test.
+
2001-12-14 Aldy Hernandez <aldyh@redhat.com>
* testsuite/gcc.dg/20011214-1.c: New.
--- /dev/null
+/* 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;
+}