diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2013-05-07 07:59:37 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2013-05-07 07:59:37 +0000 |
| commit | dcbac1a471cb8dbf8f6aa43d94f905768770f546 (patch) | |
| tree | 2d34e06df5858f596a6c1f4f8535dbf329150335 | |
| parent | 14523c2517b9f272f18d7be133f69f162c8ceac7 (diff) | |
| download | gcc-dcbac1a471cb8dbf8f6aa43d94f905768770f546.zip gcc-dcbac1a471cb8dbf8f6aa43d94f905768770f546.tar.gz gcc-dcbac1a471cb8dbf8f6aa43d94f905768770f546.tar.bz2 | |
re PR ada/56474 (bogus Storage_Error raised for record containing empty zero-based array)
PR ada/56474
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Subtype>: Use
int_const_binop to shift bounds by 1 when they are integer constants.
From-SVN: r198663
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gnat.dg/specs/array3.ads | 18 |
4 files changed, 38 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5088853..a3e776c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2013-05-07 Eric Botcazou <ebotcazou@adacore.com> + + PR ada/56474 + * gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Subtype>: Use + int_const_binop to shift bounds by 1 when they are integer constants. + 2013-04-25 Arnaud Charlet <charlet@adacore.com> * gcc-interface/Makefile.in (ADA_EXCLUDE_SRCS): Exclude s-init.ad{s,b} diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index e65701b..9865324 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -2447,15 +2447,17 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) gnu_orig_max, gnu_orig_min), gnu_min, - size_binop (PLUS_EXPR, gnu_max, - size_one_node)); + int_const_binop (PLUS_EXPR, gnu_max, + size_one_node)); } /* Finally we use (hb >= lb) ? hb : lb - 1 for the upper bound in all the other cases. Note that, here as well as above, the condition used in the comparison must be equivalent to the condition (length != 0). This is relied upon in order - to optimize array comparisons in compare_arrays. */ + to optimize array comparisons in compare_arrays. Moreover + we use int_const_binop for the shift by 1 if the bound is + constant to avoid any unwanted overflow. */ else gnu_high = build_cond_expr (sizetype, @@ -2464,8 +2466,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) gnu_orig_max, gnu_orig_min), gnu_max, - size_binop (MINUS_EXPR, gnu_min, - size_one_node)); + TREE_CODE (gnu_min) == INTEGER_CST + ? int_const_binop (MINUS_EXPR, gnu_min, + size_one_node) + : size_binop (MINUS_EXPR, gnu_min, + size_one_node)); /* Reuse the index type for the range type. Then make an index type with the size range in sizetype. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dc8c10e..0908c86 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-05-07 Eric Botcazou <ebotcazou@adacore.com> + + * gnat.dg/specs/array3.ads: New test. + 2013-05-06 Marc Glisse <marc.glisse@inria.fr> * c-c++-common/vector-scalar-2.c: New testcase. diff --git a/gcc/testsuite/gnat.dg/specs/array3.ads b/gcc/testsuite/gnat.dg/specs/array3.ads new file mode 100644 index 0000000..3ef39f3 --- /dev/null +++ b/gcc/testsuite/gnat.dg/specs/array3.ads @@ -0,0 +1,18 @@ +-- PR middle-end/56474 +-- Reported by Pavel Zhukov <pavel@zhukoff.net> + +-- { dg-do compile } + +with Ada.Streams; + +package Array3 is + + use type Ada.Streams.Stream_Element_Offset; + + type Vector (Size : Ada.Streams.Stream_Element_Offset) is record + Value : Ada.Streams.Stream_Element_Array (0 .. Size); + end record; + + Empty_Vector : Vector (-1); + +end Array3; |