From 5d5995f10531955de2e5f3c1a0979205d71ffb70 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 10 Aug 2006 22:13:42 +0000 Subject: [PATCH] tree.c (build1_stat): Also propagate the TREE_CONSTANT and TREE_INVARIANT flags for a VIEW_CONVERT_EXPR. * tree.c (build1_stat): Also propagate the TREE_CONSTANT and TREE_INVARIANT flags for a VIEW_CONVERT_EXPR. From-SVN: r116071 --- gcc/ChangeLog | 5 +++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/specs/static_initializer.ads | 14 ++++++++++++++ gcc/tree.c | 4 ++-- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/specs/static_initializer.ads diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5d6f9d5255a..c42ae6017d5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2006-08-11 Eric Botcazou + + * tree.c (build1_stat): Also propagate the TREE_CONSTANT and + TREE_INVARIANT flags for a VIEW_CONVERT_EXPR. + 2006-08-10 Paul Brook * final.c (final_scan_insn): Clear current_insn_predicate before diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f08c34c63ef..44a48940b89 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2006-08-10 Eric Botcazou + + * gnat.dg/specs/static_initializer.ads: New test. + 2006-08-10 Paul Brook * gcc.target/arm/cond-asm.c: New test. diff --git a/gcc/testsuite/gnat.dg/specs/static_initializer.ads b/gcc/testsuite/gnat.dg/specs/static_initializer.ads new file mode 100644 index 00000000000..8755c30d17b --- /dev/null +++ b/gcc/testsuite/gnat.dg/specs/static_initializer.ads @@ -0,0 +1,14 @@ +-- { dg-do compile } + +package static_initializer is + + type Vector is array (1 .. 3) of Float; + type Arr is array (Integer range 1 .. 3) of Vector; + + Pos : constant Arr := ((0.0, 1.0, 2.0), + (0.5, 1.5, 2.5), + (1.0, 2.0, 4.0)); + +end; + +-- { dg-final { scan-assembler-not "elabs" } } diff --git a/gcc/tree.c b/gcc/tree.c index dc78ad775af..efccfb11d9a 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -2923,11 +2923,11 @@ build1_stat (enum tree_code code, tree type, tree node MEM_STAT_DECL) break; default: - if (TREE_CODE_CLASS (code) == tcc_unary + if ((TREE_CODE_CLASS (code) == tcc_unary || code == VIEW_CONVERT_EXPR) && node && !TYPE_P (node) && TREE_CONSTANT (node)) TREE_CONSTANT (t) = 1; - if (TREE_CODE_CLASS (code) == tcc_unary + if ((TREE_CODE_CLASS (code) == tcc_unary || code == VIEW_CONVERT_EXPR) && node && TREE_INVARIANT (node)) TREE_INVARIANT (t) = 1; if (TREE_CODE_CLASS (code) == tcc_reference -- 2.30.2