diff options
| author | Javier Miranda <miranda@adacore.com> | 2018-07-31 09:55:26 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-07-31 09:55:26 +0000 |
| commit | b09a237ab879a169416c3be1af8a773e982fd53a (patch) | |
| tree | 74ca9b929f74d2a445137d3a9061cf40dd349c44 /gcc/ada/sem.adb | |
| parent | 3bb9bd7dcc46a48b45419072e552336d3e6569fd (diff) | |
| download | gcc-b09a237ab879a169416c3be1af8a773e982fd53a.zip gcc-b09a237ab879a169416c3be1af8a773e982fd53a.tar.gz gcc-b09a237ab879a169416c3be1af8a773e982fd53a.tar.bz2 | |
[Ada] Fix a freezing issue
2018-07-31 Javier Miranda <miranda@adacore.com>
gcc/ada/
* sem.ads (Inside_Preanalysis_Without_Freezing): New global
counter.
* sem.adb (Semantics): This subprogram has now the
responsibility of resetting the counter before analyzing a unit,
and restoring its previous value before returning.
* freeze.adb (Freeze_Entity): Do not freeze if we are
preanalyzing without freezing.
* sem_res.adb (Preanalyze_And_Resolve): Set & restore
In_Preanalysis_Without_Freezing.
From-SVN: r263091
Diffstat (limited to 'gcc/ada/sem.adb')
| -rw-r--r-- | gcc/ada/sem.adb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ada/sem.adb b/gcc/ada/sem.adb index 799d66d..2415ef8 100644 --- a/gcc/ada/sem.adb +++ b/gcc/ada/sem.adb @@ -1447,9 +1447,18 @@ package body Sem is -- unit. All with'ed units are analyzed with config restrictions reset -- and we need to restore these saved values at the end. + Save_Preanalysis_Counter : constant Nat := + Inside_Preanalysis_Without_Freezing; + -- Saves the preanalysis nesting-level counter; required since we may + -- need to analyze a unit as a consequence of the preanalysis of an + -- expression without freezing (and the loaded unit must be fully + -- analyzed). + -- Start of processing for Semantics begin + Inside_Preanalysis_Without_Freezing := 0; + if Debug_Unit_Walk then if Already_Analyzed then Write_Str ("(done)"); @@ -1622,6 +1631,8 @@ package body Sem is Unit (Comp_Unit), Prefix => "<-- "); end if; + + Inside_Preanalysis_Without_Freezing := Save_Preanalysis_Counter; end Semantics; -------- |