diff options
author | Eric Botcazou <ebotcazou@adacore.com> | 2017-09-05 08:14:35 +0000 |
---|---|---|
committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2017-09-05 08:14:35 +0000 |
commit | babf697a2da6eff7ea91e02605023b309119a175 (patch) | |
tree | 3742a50e2cddae5fa2bd072065f1b69856d49bc9 /gcc/ada | |
parent | 02e637d86f9ecb6d0e368438291bb6f6f8feb3ab (diff) | |
download | gcc-babf697a2da6eff7ea91e02605023b309119a175.zip gcc-babf697a2da6eff7ea91e02605023b309119a175.tar.gz gcc-babf697a2da6eff7ea91e02605023b309119a175.tar.bz2 |
trans.c (pos_to_constructor): Skip conversions to an unconstrained array type.
* gcc-interface/trans.c (pos_to_constructor): Skip conversions to an
unconstrained array type.
From-SVN: r251691
Diffstat (limited to 'gcc/ada')
-rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/ada/gcc-interface/trans.c | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index fe93c05..32030b5 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2017-09-05 Eric Botcazou <ebotcazou@adacore.com> + + * gcc-interface/trans.c (pos_to_constructor): Skip conversions to an + unconstrained array type. + 2017-08-30 Richard Sandiford <richard.sandiford@linaro.org> Alan Hayward <alan.hayward@arm.com> David Sherwood <david.sherwood@arm.com> diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 693c74f..f7b51bb 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -9826,7 +9826,14 @@ pos_to_constructor (Node_Id gnat_expr, tree gnu_array_type, gnat_component_type); else { - gnu_expr = gnat_to_gnu (gnat_expr); + /* If the expression is a conversion to an unconstrained array type, + skip it to avoid spilling to memory. */ + if (Nkind (gnat_expr) == N_Type_Conversion + && Is_Array_Type (Etype (gnat_expr)) + && !Is_Constrained (Etype (gnat_expr))) + gnu_expr = gnat_to_gnu (Expression (gnat_expr)); + else + gnu_expr = gnat_to_gnu (gnat_expr); /* Before assigning the element to the array, make sure it is in range. */ |