diff options
| -rw-r--r-- | gcc/ada/exp_tss.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/inline.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_aggr.adb | 38 |
3 files changed, 32 insertions, 10 deletions
diff --git a/gcc/ada/exp_tss.adb b/gcc/ada/exp_tss.adb index ad60e7a..65bf431 100644 --- a/gcc/ada/exp_tss.adb +++ b/gcc/ada/exp_tss.adb @@ -44,7 +44,7 @@ package body Exp_Tss is Proc : Entity_Id; begin - pragma Assert (Ekind (Typ) in Type_Kind); + pragma Assert (Is_Type (Typ)); if Is_Private_Type (Typ) then Full_Type := Underlying_Type (Base_Type (Typ)); diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index 3575d8f..f39bbba 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -308,7 +308,7 @@ package body Inline is -- no enclosing package to retrieve. In this case, it is the body of -- the function that will have to be loaded. - if not Is_Abstract (E) and then not Is_Nested (E) + if not Is_Abstract_Subprogram (E) and then not Is_Nested (E) and then Convention (E) /= Convention_Protected then Pack := Scope (E); diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 3ee1915..4ca446c 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -2612,7 +2612,7 @@ package body Sem_Aggr is -- STEP 1: abstract type and null record verification - if Is_Abstract (Typ) then + if Is_Abstract_Type (Typ) then Error_Msg_N ("type of aggregate cannot be abstract", N); end if; @@ -3000,7 +3000,9 @@ package body Sem_Aggr is -- pass the component to the expander, which will generate -- the call to such IP. - if Has_Non_Null_Base_Init_Proc (Ctyp) then + if Has_Non_Null_Base_Init_Proc (Ctyp) + or else not Expander_Active + then Add_Association (Component => Component, Expr => Empty, @@ -3075,12 +3077,34 @@ package body Sem_Aggr is end loop; -- If no association, this is not a legal component of - -- of the type in question, except if this is an internal - -- component supplied by a previous expansion. + -- of the type in question, except if its association + -- is provided with a box. if No (New_Assoc) then if Box_Present (Parent (Selectr)) then - null; + + -- This may still be a bogus component with a box. Scan + -- list of components to verify that a component with + -- that name exists. + + declare + C : Entity_Id; + + begin + C := First_Component (Typ); + while Present (C) loop + if Chars (C) = Chars (Selectr) then + exit; + end if; + + Next_Component (C); + end loop; + + if No (C) then + Error_Msg_Node_2 := Typ; + Error_Msg_N ("& is not a component of}", Selectr); + end if; + end; elsif Chars (Selectr) /= Name_uTag and then Chars (Selectr) /= Name_uParent @@ -3088,9 +3112,7 @@ package body Sem_Aggr is then if not Has_Discriminants (Typ) then Error_Msg_Node_2 := Typ; - Error_Msg_N - ("& is not a component of}", - Selectr); + Error_Msg_N ("& is not a component of}", Selectr); else Error_Msg_N ("& is not a component of the aggregate subtype", |