diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2008-11-03 19:55:54 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2008-11-03 19:55:54 +0000 |
| commit | 2d8d91a8404e26f124d16cc91ff08291bd700c1b (patch) | |
| tree | 91e5bdac25132fe31844daa7243769913efcad05 /gcc | |
| parent | e73da78efc08838680dee919a4eb060d2f8c78dd (diff) | |
| download | gcc-2d8d91a8404e26f124d16cc91ff08291bd700c1b.zip gcc-2d8d91a8404e26f124d16cc91ff08291bd700c1b.tar.gz gcc-2d8d91a8404e26f124d16cc91ff08291bd700c1b.tar.bz2 | |
* tree-sra.c (bitfield_overlaps_p): Fix oversight.
From-SVN: r141556
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gnat.dg/array5.adb | 34 | ||||
| -rw-r--r-- | gcc/tree-sra.c | 5 |
4 files changed, 47 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0cd01ee..2101355 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2008-11-03 Eric Botcazou <ebotcazou@adacore.com> + + * tree-sra.c (bitfield_overlaps_p): Fix oversight. + 2008-11-03 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> PR other/37463 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 06893ec..626145e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-11-03 Eric Botcazou <ebotcazou@adacore.com> + + * gnat.dg/array5.adb New test. + 2008-11-03 Richard Guenther <rguenther@suse.de> Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/testsuite/gnat.dg/array5.adb b/gcc/testsuite/gnat.dg/array5.adb new file mode 100644 index 0000000..72a5df8 --- /dev/null +++ b/gcc/testsuite/gnat.dg/array5.adb @@ -0,0 +1,34 @@ +-- { dg-do run } +-- { dg-options "-O" } + +procedure Array5 is + + type myint is range 0 .. 100_000; + Bla : constant myint := 359; + + type my_array is array (1 .. 2) of myint; + + type item is record + Length : Integer; + Content : my_array; + end record; + + procedure create_item (M : out item) is + begin + M.Length := 1; + M.Content := (others => Bla); + end; + + Var : item; + +begin + create_item (Var); + + if Var.Length = 1 + and then Var.Content (1) = Bla + then + null; + else + raise Program_Error; + end if; +end; diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index 3689b69..60330b1 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -2961,8 +2961,13 @@ bitfield_overlaps_p (tree blen, tree bpos, struct sra_elt *fld, } else if (TREE_CODE (fld->element) == INTEGER_CST) { + tree domain_type = TYPE_DOMAIN (TREE_TYPE (fld->parent->element)); flen = fold_convert (bitsizetype, TYPE_SIZE (fld->type)); fpos = fold_convert (bitsizetype, fld->element); + if (domain_type && TYPE_MIN_VALUE (domain_type)) + fpos = size_binop (MINUS_EXPR, fpos, + fold_convert (bitsizetype, + TYPE_MIN_VALUE (domain_type))); fpos = size_binop (MULT_EXPR, flen, fpos); } else |