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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bd160a807e32c2af558dfef019d0a11ccde4e0a8..986d97bf36fa7b0a1572960955f96a04f63c047d 100644 (file)
--- 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 f8ee02dd173b733baefa6b3b6a17bfb1ce7cb69f..ee790ad4aea33e20a317497d83f042d47a42642c 100644 (file)
--- 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