diff options
| author | Olivier Hainque <hainque@adacore.com> | 2009-06-01 15:27:59 +0000 |
|---|---|---|
| committer | Olivier Hainque <hainque@gcc.gnu.org> | 2009-06-01 15:27:59 +0000 |
| commit | db868e1edfabd88ca30f61e1b8e11155dc2a7ba5 (patch) | |
| tree | ecb474a41df463273bc0efc8acb2f9b87af38038 /gcc/ada/gcc-interface/utils.c | |
| parent | 62295314f0a1f3ddea8cf54a888c4b9b3a4bec68 (diff) | |
| download | gcc-db868e1edfabd88ca30f61e1b8e11155dc2a7ba5.zip gcc-db868e1edfabd88ca30f61e1b8e11155dc2a7ba5.tar.gz gcc-db868e1edfabd88ca30f61e1b8e11155dc2a7ba5.tar.bz2 | |
utils.c (convert): When converting to the packable version of the type...
ada/
* gcc-interface/utils.c (convert) <CONSTRUCTOR case>: When converting
to the packable version of the type, clear TREE_STATIC/TREE_CONSTANT
on the result if at least one of the input fields couldn't be output
as a static constant any more.
testsuite/
* gnat.dg/nested_float_packed.ads: New test.
Co-Authored-By: Eric Botcazou <ebotcazou@adacore.com>
From-SVN: r148049
Diffstat (limited to 'gcc/ada/gcc-interface/utils.c')
| -rw-r--r-- | gcc/ada/gcc-interface/utils.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index 6dbd1e7..f3755a0 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -3979,6 +3979,10 @@ convert (tree type, tree expr) unsigned HOST_WIDE_INT idx; tree index, value; + /* Whether we need to clear TREE_CONSTANT et al. on the output + constructor when we convert in place. */ + bool clear_constant = false; + FOR_EACH_CONSTRUCTOR_ELT(e, idx, index, value) { constructor_elt *elt = VEC_quick_push (constructor_elt, v, NULL); @@ -3987,15 +3991,30 @@ convert (tree type, tree expr) break; elt->index = field; elt->value = convert (TREE_TYPE (field), value); + + /* If packing has made this field a bitfield and the input + value couldn't be emitted statically any more, we need to + clear TREE_CONSTANT on our output. */ + if (!clear_constant && TREE_CONSTANT (expr) + && !CONSTRUCTOR_BITFIELD_P (efield) + && CONSTRUCTOR_BITFIELD_P (field) + && !initializer_constant_valid_for_bitfield_p (value)) + clear_constant = true; + efield = TREE_CHAIN (efield); field = TREE_CHAIN (field); } + /* If we have been able to match and convert all the input fields + to their output type, convert in place now. We'll fallback to a + view conversion downstream otherwise. */ if (idx == len) { expr = copy_node (expr); TREE_TYPE (expr) = type; CONSTRUCTOR_ELTS (expr) = v; + if (clear_constant) + TREE_CONSTANT (expr) = TREE_STATIC (expr) = false; return expr; } } |