diff options
| author | Justin Squirek <squirek@adacore.com> | 2018-09-26 09:17:21 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-09-26 09:17:21 +0000 |
| commit | b45a9ff305f536031a12509c6c6e7aea9cb7f884 (patch) | |
| tree | e50986c734e96e988f0412ebc25891b9b39455e6 /gcc/ada | |
| parent | bcbe14db192f03018ea74cf6eb24c04a110ecac0 (diff) | |
| download | gcc-b45a9ff305f536031a12509c6c6e7aea9cb7f884.zip gcc-b45a9ff305f536031a12509c6c6e7aea9cb7f884.tar.gz gcc-b45a9ff305f536031a12509c6c6e7aea9cb7f884.tar.bz2 | |
[Ada] Crash on expression functions within quantified expressions
This patch fixes an issue whereby using a call to an expression function
as the domain of iteration for a loop would trigger a crash due to the
function not being frozen appropriately.
2018-09-26 Justin Squirek <squirek@adacore.com>
gcc/ada/
* sem_ch5.adb (Analyze_Iterator_Specification): Add conditional
to freeze called functions within iterator specifications during
full analysis.
(Preanalyze_Range): Minor typo fix.
gcc/testsuite/
* gnat.dg/expr_func8.adb: New testcase.
From-SVN: r264612
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/sem_ch5.adb | 21 |
2 files changed, 24 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 9db2747..4ab1bcd 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2018-09-26 Justin Squirek <squirek@adacore.com> + + * sem_ch5.adb (Analyze_Iterator_Specification): Add conditional + to freeze called functions within iterator specifications during + full analysis. + (Preanalyze_Range): Minor typo fix. + 2018-09-26 Ed Schonberg <schonberg@adacore.com> * sem_ch6.adb (Analyze_Function_Return): If the return type has diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb index f35b37d..2f44691 100644 --- a/gcc/ada/sem_ch5.adb +++ b/gcc/ada/sem_ch5.adb @@ -2203,6 +2203,19 @@ package body Sem_Ch5 is Preanalyze_Range (Iter_Name); + -- If the domain of iteration is a function call, make sure the function + -- itself is frozen. This is an issue if this is a local expression + -- function. + + if Nkind (Iter_Name) = N_Function_Call + and then Is_Entity_Name (Name (Iter_Name)) + and then Full_Analysis + and then (In_Assertion_Expr = 0 + or else Assertions_Enabled) + then + Freeze_Before (N, Entity (Name (Iter_Name))); + end if; + -- Set the kind of the loop variable, which is not visible within the -- iterator name. @@ -4136,10 +4149,10 @@ package body Sem_Ch5 is Full_Analysis := False; Expander_Mode_Save_And_Set (False); - -- In addition to the above we must ecplicity suppress the - -- generation of freeze nodes which might otherwise be generated - -- during resolution of the range (e.g. if given by an attribute - -- that will freeze its prefix). + -- In addition to the above we must explicitly suppress the generation + -- of freeze nodes that might otherwise be generated during resolution + -- of the range (e.g. if given by an attribute that will freeze its + -- prefix). Set_Must_Not_Freeze (R_Copy); |