diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-04 10:22:32 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-04 10:22:32 +0000 |
| commit | d6a5a2012650a9351920d01f8504662640c9007a (patch) | |
| tree | dfd0089361c6c3ea3307fde051e577ae38d63772 /gcc/ada/sem_aggr.adb | |
| parent | 37a399967d072d4dd9600672135761bae517251d (diff) | |
| download | gcc-d6a5a2012650a9351920d01f8504662640c9007a.tar.gz | |
2014-08-04 Robert Dewar <dewar@adacore.com>
* gnat_ugn.texi: Clarify documentation on assertions.
2014-08-04 Ed Schonberg <schonberg@adacore.com>
* sem_aggr.adb (Resolve_Record_Aggregate, Get_Value): Warn
if a component association has a box initialization when the
component type has no default initialization, either through an
initial value, an aspect, or an implicit initialization procedure.
2014-08-04 Ed Schonberg <schonberg@adacore.com>
* freeze.adb: Code clean up.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213563 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sem_aggr.adb')
| -rw-r--r-- | gcc/ada/sem_aggr.adb | 47 |
1 files changed, 38 insertions, 9 deletions
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 56c4fad0348..654f413c088 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -23,6 +23,7 @@ -- -- ------------------------------------------------------------------------------ +with Aspects; use Aspects; with Atree; use Atree; with Checks; use Checks; with Einfo; use Einfo; @@ -3168,6 +3169,7 @@ package body Sem_Aggr is Consider_Others_Choice : Boolean := False) return Node_Id is + Typ : constant Entity_Id := Etype (Compon); Assoc : Node_Id; Expr : Node_Id := Empty; Selector_Name : Node_Id; @@ -3215,15 +3217,15 @@ package body Sem_Aggr is end if; else - if Present (Others_Etype) and then - Base_Type (Others_Etype) /= Base_Type (Etype - (Compon)) + if Present (Others_Etype) + and then Base_Type (Others_Etype) /= Base_Type (Typ) then - Error_Msg_N ("components in OTHERS choice must " & - "have same type", Selector_Name); + Error_Msg_N + ("components in OTHERS choice must " + & "have same type", Selector_Name); end if; - Others_Etype := Etype (Compon); + Others_Etype := Typ; if Expander_Active then return @@ -3269,15 +3271,42 @@ package body Sem_Aggr is -- initialized, but an association for the component -- exists, and it is not covered by an others clause. + -- Scalar and private types have no initialization + -- procedure, so they remain uninitialized. If the + -- target of the aggregate is a constant this + -- deserves a warning. + + if No (Expression (Parent (Compon))) + and then not Has_Non_Null_Base_Init_Proc (Typ) + and then not Has_Aspect (Typ, Aspect_Default_Value) + and then not Is_Concurrent_Type (Typ) + and then Nkind (Parent (N)) = N_Object_Declaration + and then Constant_Present (Parent (N)) + then + Error_Msg_Node_2 := Typ; + Error_Msg_NE + ("component&? of type& is uninitialized", + Assoc, Selector_Name); + + -- An additional reminder if the component type + -- is a generic formal. + + if Is_Generic_Type (Base_Type (Typ)) then + Error_Msg_NE + ("\instance should provide actual " + & "type with initialization for&", + Assoc, Typ); + end if; + end if; + return New_Copy_Tree_And_Copy_Dimensions (Expression (Parent (Compon))); else if Present (Next (Selector_Name)) then - Expr := - New_Copy_Tree_And_Copy_Dimensions - (Expression (Assoc)); + Expr := New_Copy_Tree_And_Copy_Dimensions + (Expression (Assoc)); else Expr := Expression (Assoc); end if; |