diff options
| author | Ed Schonberg <schonberg@adacore.com> | 2019-09-18 08:33:27 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2019-09-18 08:33:27 +0000 |
| commit | b8411279b0674cd76850b0fa8266e8db21724e0e (patch) | |
| tree | 870d33909d2ed5dd5c09ae3ed6934a9e4fb96314 /gcc/ada | |
| parent | 483af72e4bf2499fdbbf6b6e061318eaa9ba2b2d (diff) | |
| download | gcc-b8411279b0674cd76850b0fa8266e8db21724e0e.zip gcc-b8411279b0674cd76850b0fa8266e8db21724e0e.tar.gz gcc-b8411279b0674cd76850b0fa8266e8db21724e0e.tar.bz2 | |
[Ada] Crash on aggregate with dscriminant in if-expression as default
This patch fixes a crash on a an aggregate for a discriminated type,
when a component of the aggregate is also a discriminated type
constrained by a discriminant of the enclosing object, and the default
value for the component is a conditional expression that includes
references to that outer discriminant.
2019-09-18 Ed Schonberg <schonberg@adacore.com>
gcc/ada/
* exp_aggr.adb (Expand_Record_Aggregate, Rewrite_Discriminant):
After rewriting a reference to an outer discriminant as a
selected component of the enclosing object, analyze the selected
component to ensure that the entity of the selector name is
properly set. This is necessary when the aggregate appears
within an expression that may have been analyzed already.
gcc/testsuite/
* gnat.dg/discr58.adb: New testcase.
From-SVN: r275862
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/ada/exp_aggr.adb | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 6823972..92782aa 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2019-09-18 Ed Schonberg <schonberg@adacore.com> + + * exp_aggr.adb (Expand_Record_Aggregate, Rewrite_Discriminant): + After rewriting a reference to an outer discriminant as a + selected component of the enclosing object, analyze the selected + component to ensure that the entity of the selector name is + properly set. This is necessary when the aggregate appears + within an expression that may have been analyzed already. + 2019-09-18 Justin Squirek <squirek@adacore.com> * sem_ch8.adb (Use_One_Type): Add guard to prevent warning on a diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index 5b2e0a5..63f9d1a 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -3103,6 +3103,13 @@ package body Exp_Aggr is Make_Selected_Component (Loc, Prefix => New_Copy_Tree (Lhs), Selector_Name => Make_Identifier (Loc, Chars (Expr)))); + + -- The generated code will be reanalyzed, but if the reference + -- to the discriminant appears within an already analyzed + -- expression (e.g. a conditional) we must set its proper entity + -- now. Context is an initialization procedure. + + Analyze (Expr); end if; return OK; |