diff options
| author | Justin Squirek <squirek@adacore.com> | 2019-07-03 08:16:06 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2019-07-03 08:16:06 +0000 |
| commit | eee51f3dd6d8e444270efb6fe191524b79a01445 (patch) | |
| tree | d5f2bf106c172d9babbac0a02a9f9065c963f7a6 /gcc/ada | |
| parent | f4c16c58e1a91f412eae9dd6645c165a709246cb (diff) | |
| download | gcc-eee51f3dd6d8e444270efb6fe191524b79a01445.zip gcc-eee51f3dd6d8e444270efb6fe191524b79a01445.tar.gz gcc-eee51f3dd6d8e444270efb6fe191524b79a01445.tar.bz2 | |
[Ada] Incorrect expansion on renamings of formal parameters
This patch fixes an issue whereby a renaming of an unconstrained formal
parameter leads to spurious runtime errors; manifesting either as a
storage or constraint error due to incorrect bounds being assumed.
This issue also occurs when the renamings are implicit such as through
generic instantiations.
2019-07-03 Justin Squirek <squirek@adacore.com>
gcc/ada/
* sem_ch8.adb (Analyze_Object_Renaming): Add call to search for
the appropriate actual subtype of the object renaming being
analyzed.
(Check_Constrained_Object): Minor cleanup.
gcc/testsuite/
* gnat.dg/renaming13.adb, gnat.dg/renaming14.adb: New testcases.
From-SVN: r272982
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/sem_ch8.adb | 12 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 608d870..152820f 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2019-07-03 Justin Squirek <squirek@adacore.com> + + * sem_ch8.adb (Analyze_Object_Renaming): Add call to search for + the appropriate actual subtype of the object renaming being + analyzed. + (Check_Constrained_Object): Minor cleanup. + 2019-07-03 Yannick Moy <moy@adacore.com> * sem_spark.adb (Get_Observed_Or_Borrowed_Expr): New function to diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index 5f515bc..b58ad64 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -784,9 +784,9 @@ package body Sem_Ch8 is begin if Nkind_In (Nam, N_Function_Call, N_Explicit_Dereference) - and then Is_Composite_Type (Etype (Nam)) - and then not Is_Constrained (Etype (Nam)) - and then not Has_Unknown_Discriminants (Etype (Nam)) + and then Is_Composite_Type (Typ) + and then not Is_Constrained (Typ) + and then not Has_Unknown_Discriminants (Typ) and then Expander_Active then -- If Actual_Subtype is already set, nothing to do @@ -1122,7 +1122,11 @@ package body Sem_Ch8 is Wrong_Type (Nam, T); end if; - T2 := Etype (Nam); + -- We must search for an actual subtype here so that the bounds of + -- objects of unconstrained types don't get dropped on the floor - such + -- as with renamings of formal parameters. + + T2 := Get_Actual_Subtype_If_Available (Nam); -- Ada 2005 (AI-326): Handle wrong use of incomplete type |