From 4248145849940945d7c74d0f86876f220bbab8a1 Mon Sep 17 00:00:00 2001 From: Hristian Kirtchev Date: Mon, 14 Oct 2013 13:49:15 +0000 Subject: [PATCH] sem_prag.adb (Is_Matching_Input): Consume a matching null input. 2013-10-14 Hristian Kirtchev * sem_prag.adb (Is_Matching_Input): Consume a matching null input. From-SVN: r203557 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/sem_prag.adb | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bd160a807e32..986d97bf36fa 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2013-10-14 Hristian Kirtchev + + * sem_prag.adb (Is_Matching_Input): Consume a matching null input. + 2013-10-14 Robert Dewar * 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 f8ee02dd173b..ee790ad4aea3 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 -- 2.47.2