diff options
author | Jakub Jelinek <jakub@redhat.com> | 2020-03-25 09:21:05 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2020-03-25 09:21:05 +0100 |
commit | 5f18995e23edc944af3a401d9d9d3320a9362652 (patch) | |
tree | ce7ae8f102f656e0a9d85013a496be79ba6ebb43 /gcc/varasm.c | |
parent | 158cccea0d097d9f181bf4e35fdeb97865c960f7 (diff) | |
download | gcc-5f18995e23edc944af3a401d9d9d3320a9362652.zip gcc-5f18995e23edc944af3a401d9d9d3320a9362652.tar.gz gcc-5f18995e23edc944af3a401d9d9d3320a9362652.tar.bz2 |
varasm: Fix output_constructor where a RANGE_EXPR index needs to skip some elts [PR94303]
The following testcase is miscompiled, because output_constructor doesn't
output the initializer correctly. The FE creates {[1...2] = 9} in this
case, and we emit .long 9; long 9; .zero 8 instead of the expected
.zero 8; .long 9; .long 9. If the CONSTRUCTOR is {[1] = 9, [2] = 9},
output_constructor_regular_field has code to notice that the current
location (local->total_bytes) is smaller than the location we want to write
to (1*sizeof(elt)) and will call assemble_zeros to skip those. But
RANGE_EXPRs are handled by a different function which didn't do this,
so for RANGE_EXPRs we emitted them properly only if local->total_bytes
was always equal to the location where the RANGE_EXPR needs to start.
2020-03-25 Jakub Jelinek <jakub@redhat.com>
PR middle-end/94303
* varasm.c (output_constructor_array_range): If local->index
RANGE_EXPR doesn't start at the current location in the constructor,
skip needed number of bytes using assemble_zeros or assert we don't
go backwards.
PR middle-end/94303
* g++.dg/torture/pr94303.C: New test.
Diffstat (limited to 'gcc/varasm.c')
-rw-r--r-- | gcc/varasm.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gcc/varasm.c b/gcc/varasm.c index dc6da6c..271a67a 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -5152,6 +5152,26 @@ struct oc_local_state { static void output_constructor_array_range (oc_local_state *local) { + /* Perform the index calculation in modulo arithmetic but + sign-extend the result because Ada has negative DECL_FIELD_OFFSETs + but we are using an unsigned sizetype. */ + unsigned prec = TYPE_PRECISION (sizetype); + offset_int idx = wi::sext (wi::to_offset (TREE_OPERAND (local->index, 0)) + - wi::to_offset (local->min_index), prec); + tree valtype = TREE_TYPE (local->val); + HOST_WIDE_INT fieldpos + = (idx * wi::to_offset (TYPE_SIZE_UNIT (valtype))).to_short_addr (); + + /* Advance to offset of this element. */ + if (fieldpos > local->total_bytes) + { + assemble_zeros (fieldpos - local->total_bytes); + local->total_bytes = fieldpos; + } + else + /* Must not go backwards. */ + gcc_assert (fieldpos == local->total_bytes); + unsigned HOST_WIDE_INT fieldsize = int_size_in_bytes (TREE_TYPE (local->type)); |