diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-21 12:36:41 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-05-21 12:36:41 +0000 |
| commit | e6bd3967e54965d9b07823192c9772d71ba2d10b (patch) | |
| tree | 6d0b2480705fa940efad2d1f74cddcb48d7b0511 /gcc/ada/sem_ch12.adb | |
| parent | 1336ab126a09c21576c34cc2da416d114b6cab4b (diff) | |
| download | gcc-e6bd3967e54965d9b07823192c9772d71ba2d10b.tar.gz | |
2008-05-21 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r135714
* gcc/basilys.h: explicit [re-]declaration of fatail_error.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@135715 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sem_ch12.adb')
| -rw-r--r-- | gcc/ada/sem_ch12.adb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 60833fc2bdb..75f4512c72c 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -2729,7 +2729,7 @@ package body Sem_Ch12 is Save_Parent : Node_Id; begin - -- Create copy of generic unit,and save for instantiation. If the unit + -- Create copy of generic unit, and save for instantiation. If the unit -- is a child unit, do not copy the specifications for the parent, which -- are not part of the generic tree. @@ -4040,14 +4040,15 @@ package body Sem_Ch12 is Create_Instantiation_Source (N, Gen_Unit, False, S_Adjustment); -- Copy original generic tree, to produce text for instantiation - -- Inherit overriding indicator from instance node. Act_Tree := Copy_Generic_Node (Original_Node (Gen_Decl), Empty, Instantiating => True); + -- Inherit overriding indicator from instance node + Act_Spec := Specification (Act_Tree); - Set_Must_Override (Act_Spec, Must_Override (N)); + Set_Must_Override (Act_Spec, Must_Override (N)); Set_Must_Not_Override (Act_Spec, Must_Not_Override (N)); Renaming_List := @@ -4634,7 +4635,7 @@ package body Sem_Ch12 is -- Verify that the actual subprograms match. Note that actuals -- that are attributes are rewritten as subprograms. If the -- subprogram in the formal package is defaulted, no check is - -- needed. Note that this can only happen in Ada2005 when the + -- needed. Note that this can only happen in Ada 2005 when the -- formal package can be partially parametrized. if Nkind (Unit_Declaration_Node (E1)) = @@ -9982,7 +9983,9 @@ package body Sem_Ch12 is Check_Restriction (No_Fixed_Point, Actual); end if; - -- Deal with error of using incomplete type as generic actual + -- Deal with error of using incomplete type as generic actual. + -- This includes limited views of a type, even if the non-limited + -- view may be available. if Ekind (Act_T) = E_Incomplete_Type or else (Is_Class_Wide_Type (Act_T) |