diff options
| author | Martin Jambor <mjambor@suse.cz> | 2011-06-16 22:21:21 +0200 |
|---|---|---|
| committer | Martin Jambor <jamborm@gcc.gnu.org> | 2011-06-16 22:21:21 +0200 |
| commit | ee460e75424c78db2684a8f4dec1c993b0c05758 (patch) | |
| tree | 148334680920f915f20b2a6b506202f76d398ff5 /gcc/tree-sra.c | |
| parent | a285ba2ef9a4ebdd613b12bca42576816fe6251f (diff) | |
| download | gcc-ee460e75424c78db2684a8f4dec1c993b0c05758.zip gcc-ee460e75424c78db2684a8f4dec1c993b0c05758.tar.gz gcc-ee460e75424c78db2684a8f4dec1c993b0c05758.tar.bz2 | |
re PR tree-optimization/49343 (ICE on field with variable offset)
2011-06-16 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/49343
* tree-sra.c (build_ref_for_model): Use component_ref_field_offset to
calculate offset, provide 2nd operand for the new COMPONENT_REF.
* testsuite/gnat.dg/discr31.adb: New test.
* testsuite/gnat.dg/discr31.ads: Likewise.
From-SVN: r175111
Diffstat (limited to 'gcc/tree-sra.c')
| -rw-r--r-- | gcc/tree-sra.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index c7f4174..28eba43 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -1421,12 +1421,16 @@ build_ref_for_model (location_t loc, tree base, HOST_WIDE_INT offset, { if (TREE_CODE (model->expr) == COMPONENT_REF) { - tree t, exp_type; - offset -= int_bit_position (TREE_OPERAND (model->expr, 1)); + tree t, exp_type, fld = TREE_OPERAND (model->expr, 1); + tree cr_offset = component_ref_field_offset (model->expr); + + gcc_assert (cr_offset && host_integerp (cr_offset, 1)); + offset -= TREE_INT_CST_LOW (cr_offset) * BITS_PER_UNIT; + offset -= TREE_INT_CST_LOW (DECL_FIELD_BIT_OFFSET (fld)); exp_type = TREE_TYPE (TREE_OPERAND (model->expr, 0)); t = build_ref_for_offset (loc, base, offset, exp_type, gsi, insert_after); - return fold_build3_loc (loc, COMPONENT_REF, model->type, t, - TREE_OPERAND (model->expr, 1), NULL_TREE); + return fold_build3_loc (loc, COMPONENT_REF, model->type, t, fld, + TREE_OPERAND (model->expr, 2)); } else return build_ref_for_offset (loc, base, offset, model->type, |