diff options
| author | Hristian Kirtchev <kirtchev@adacore.com> | 2013-10-14 13:49:15 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-10-14 15:49:15 +0200 |
| commit | 4248145849940945d7c74d0f86876f220bbab8a1 (patch) | |
| tree | 321c3aec63dc42afa3ae0bc56cd76461b49194f7 /gcc | |
| parent | d12b19faee90335468d8e4308db001e81e826147 (diff) | |
| download | gcc-4248145849940945d7c74d0f86876f220bbab8a1.zip gcc-4248145849940945d7c74d0f86876f220bbab8a1.tar.gz gcc-4248145849940945d7c74d0f86876f220bbab8a1.tar.bz2 | |
sem_prag.adb (Is_Matching_Input): Consume a matching null input.
2013-10-14 Hristian Kirtchev <kirtchev@adacore.com>
* sem_prag.adb (Is_Matching_Input): Consume a matching null input.
From-SVN: r203557
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/sem_prag.adb | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bd160a8..986d97b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2013-10-14 Hristian Kirtchev <kirtchev@adacore.com> + + * sem_prag.adb (Is_Matching_Input): Consume a matching null input. + 2013-10-14 Robert Dewar <dewar@adacore.com> * freeze.adb (Freeze_Record): Don't give warning about packed diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index f8ee02d..ee790ad 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -19965,7 +19965,13 @@ package body Sem_Prag is -- Match a null input with another null input if Nkind (Dep_Input) = N_Null then - if Nkind (Expression (Ref_Clause)) = N_Null then + Ref_Input := First (Ref_Inputs); + + -- Remove the matching null from the pool of candidates + + if Nkind (Ref_Input) = N_Null then + Remove (Ref_Input); + return True; else Match_Error |