diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/ada/exp_prag.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_prag.adb | 7 |
3 files changed, 19 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0bcbc7ca1d8..8a8bcb43e29 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,15 @@ +2013-10-17 Hristian Kirtchev <kirtchev@adacore.com> + + * sem_prag.adb (Check_Dependency_Clause): + Recognize the scenario where successful clause matching has + depleted the available refinement items and the clause to match + technically refines to null => null. + +2013-10-17 Tristan Gingold <gingold@adacore.com> + + * exp_prag.adb (Expand_Pragma_Import_Or_Interface): Specify + External_Name instead of Link_Name for the RTTI declaration. + 2013-10-17 Robert Dewar <dewar@adacore.com> * sem_prag.adb (Record_Possible_Body_Reference): Fix test for diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb index f4314780f9e..693aac9b35f 100644 --- a/gcc/ada/exp_prag.adb +++ b/gcc/ada/exp_prag.adb @@ -628,7 +628,7 @@ package body Exp_Prag is Expression => Make_Identifier (Loc, Chars (Dum))), Make_Pragma_Argument_Association (Loc, - Chars => Name_Link_Name, + Chars => Name_External_Name, Expression => Relocate_Node (Rtti_Name)))))); Rewrite (Expression (Foreign_Data), diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 738ab266805..19d88778715 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -20467,7 +20467,12 @@ package body Sem_Prag is -- Depends => (State => null) -- Refined_Depends => null -- OK - if No (Refinements) and then Is_Entity_Name (Dep_Output) then + -- Another instance of the same scenario occurs when the list of + -- refinements has been depleted while processing previous clauses. + + if Is_Entity_Name (Dep_Output) + and then (No (Refinements) or else Is_Empty_List (Refinements)) + then Dep_Id := Entity_Of (Dep_Output); if Ekind (Dep_Id) = E_Abstract_State |