aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2012-05-18 20:33:49 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2012-05-18 20:33:49 +0000
commit1d5bfe9720e54fa5b723046046b4a150b1f982e7 (patch)
tree09b3a596144a94ed903755fd076214a442084a3c /gcc
parentb8b552d99b245b79f9969cecf38619f8183591f6 (diff)
downloadgcc-1d5bfe9720e54fa5b723046046b4a150b1f982e7.zip
gcc-1d5bfe9720e54fa5b723046046b4a150b1f982e7.tar.gz
gcc-1d5bfe9720e54fa5b723046046b4a150b1f982e7.tar.bz2
decl.c (gnat_to_gnu_entity): For an object at global level with unconstrained nominal subtype and a...
* gcc-interface/decl.c (gnat_to_gnu_entity) <object>: For an object at global level with unconstrained nominal subtype and a non-fixed size, make a variable for the size. From-SVN: r187666
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog6
-rw-r--r--gcc/ada/gcc-interface/decl.c8
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gnat.dg/specs/lto12.ads10
-rw-r--r--gcc/testsuite/gnat.dg/specs/lto12_pkg.ads14
5 files changed, 43 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b67d659..832317b 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-18 Eric Botcazou <ebotcazou@adacore.com>
+
+ * gcc-interface/decl.c (gnat_to_gnu_entity) <object>: For an object at
+ global level with unconstrained nominal subtype and a non-fixed size,
+ make a variable for the size.
+
2012-05-15 Andris Pavenis <andris.pavenis@iki.fi>
PR ada/52494
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 97ade5e..bb36269 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -760,6 +760,14 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
gnu_size = max_size (TYPE_SIZE (gnu_type), true);
mutable_p = true;
}
+
+ /* If we are at global level and the size isn't constant, call
+ elaborate_expression_1 to make a variable for it rather than
+ calculating it each time. */
+ if (global_bindings_p () && !TREE_CONSTANT (gnu_size))
+ gnu_size = elaborate_expression_1 (gnu_size, gnat_entity,
+ get_identifier ("SIZE"),
+ definition, false);
}
/* If the size is zero byte, make it one byte since some linkers have
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 87941bd..697090f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-18 Eric Botcazou <ebotcazou@adacore.com>
+
+ * gnat.dg/specs/lto12.ads: New test.
+ * gnat.dg/specs/lto12_pkg.ads: New helper.
+
2012-05-18 Richard Guenther <rguenther@suse.de>
PR tree-optimization/53346
diff --git a/gcc/testsuite/gnat.dg/specs/lto12.ads b/gcc/testsuite/gnat.dg/specs/lto12.ads
new file mode 100644
index 0000000..3914e0f
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/specs/lto12.ads
@@ -0,0 +1,10 @@
+-- { dg-do compile }
+-- { dg-options "-flto" { target lto } }
+
+with Lto12_Pkg; use Lto12_Pkg;
+
+package Lto12 is
+
+ C : constant R := F;
+
+end Lto12;
diff --git a/gcc/testsuite/gnat.dg/specs/lto12_pkg.ads b/gcc/testsuite/gnat.dg/specs/lto12_pkg.ads
new file mode 100644
index 0000000..02ee491
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/specs/lto12_pkg.ads
@@ -0,0 +1,14 @@
+-- { dg-excess-errors "cannot generate code" }
+
+package Lto12_Pkg is
+
+ type R (Kind : Boolean := False) is record
+ case Kind is
+ when True => I : Integer;
+ when others => null;
+ end case;
+ end record;
+
+ function F return R;
+
+end Lto12_Pkg;