From 0461b801bf19aa735ecdd2d65e70ca253d5b6fbd Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 28 Sep 2006 19:14:05 +0000
Subject: [PATCH] gimplify.c (gimplify_init_ctor_preeval): Call
maybe_with_size_expr on the element before gimplifying it...
* gimplify.c (gimplify_init_ctor_preeval): Call maybe_with_size_expr
on the element before gimplifying it, instead of punting if it is of
variable size.
From-SVN: r117288
---
gcc/ChangeLog | 6 +++++
gcc/gimplify.c | 5 ++--
gcc/testsuite/ChangeLog | 4 +++
.../gnat.dg/self_aggregate_with_pointer.adb | 26 +++++++++++++++++++
4 files changed, 38 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/gnat.dg/self_aggregate_with_pointer.adb
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1044cc057de4..779868b015f5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-28 Eric Botcazou <ebotcazou@adacore.com>
+
+ * gimplify.c (gimplify_init_ctor_preeval): Call maybe_with_size_expr
+ on the element before gimplifying it, instead of punting if it is of
+ variable size.
+
2006-09-28 Zdenek Dvorak <dvorakz@suse.cz>
* doc/loop.texi: New file.
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index a408c01ae3aa..9db673a62d91 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -2670,9 +2670,8 @@ gimplify_init_ctor_preeval (tree *expr_p, tree *pre_p, tree *post_p,
return;
}
- /* We can't preevaluate if the type contains a placeholder. */
- if (type_contains_placeholder_p (TREE_TYPE (*expr_p)))
- return;
+ /* If this is a variable sized type, we must remember the size. */
+ maybe_with_size_expr (expr_p);
/* Gimplify the constructor element to something appropriate for the rhs
of a MODIFY_EXPR. Given that we know the lhs is an aggregate, we know
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 715e252dc6b9..112f6fe64a17 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-28 Eric Botcazou <ebotcazou@adacore.com>
+
+ * gnat.dg/self_aggregate_with_pointer.adb: New test.
+
2006-09-27 Steven G. Kargl <kargls@gcc.gnu.org>
PR fortran/28276
diff --git a/gcc/testsuite/gnat.dg/self_aggregate_with_pointer.adb b/gcc/testsuite/gnat.dg/self_aggregate_with_pointer.adb
new file mode 100644
index 000000000000..179fe4e97227
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/self_aggregate_with_pointer.adb
@@ -0,0 +1,26 @@
+-- { dg-do run }
+
+procedure self_aggregate_with_pointer is
+
+ type Arr is array (Natural range <>) of Integer;
+
+ type Rec (N : Natural) is record
+ A : Arr (1..N);
+ end record;
+
+ type Acc_Rec is access all Rec;
+
+ type SRec is record
+ A : Acc_Rec;
+ I1, I2, I3, I4, I5, I6, I7: Integer;
+ end record;
+
+ R : aliased Rec (1);
+ S : Srec := (A => R'Access, others => 0);
+
+begin
+ S := (A => S.A, others => 0);
+ if S.A /= R'Access then
+ raise Program_Error;
+ end if;
+end;
--
GitLab