diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2017-01-20 11:38:54 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2017-01-20 11:38:54 +0100 |
| commit | 4f324de225b3f282bece2f27344ee2767bac81d1 (patch) | |
| tree | ca4aa9e43d3c9b75b3a2a40c8070a6bc49ed2d90 /gcc | |
| parent | f68fc405bb5b38c545498c4a1dba203e51dade32 (diff) | |
| download | gcc-4f324de225b3f282bece2f27344ee2767bac81d1.zip gcc-4f324de225b3f282bece2f27344ee2767bac81d1.tar.gz gcc-4f324de225b3f282bece2f27344ee2767bac81d1.tar.bz2 | |
Minor reformatting.
From-SVN: r244700
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/inline.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/sem_ch4.adb | 16 | ||||
| -rw-r--r-- | gcc/ada/sem_res.adb | 6 |
4 files changed, 17 insertions, 17 deletions
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index f1afe32..3b79bc3 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -3158,10 +3158,8 @@ package body Inline is -- unconstrained type renaming a local variable of constrained -- type, which is not expected by GNATprove. - elsif Etype (F) /= Etype (A) - and then not GNATprove_Mode - then - New_A := Unchecked_Convert_To (Etype (F), Relocate_Node (A)); + elsif Etype (F) /= Etype (A) and then not GNATprove_Mode then + New_A := Unchecked_Convert_To (Etype (F), Relocate_Node (A)); Temp_Typ := Etype (F); else diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 8f1ce7d..5e4641e 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -1808,17 +1808,17 @@ package body Sem_Ch13 is ("aspect must name a discriminant of current type", Expr); else - -- Discriminant type be an anonymous access type or an -- anonymous access to subprogram. + -- Missing synchronized types??? Disc := First_Discriminant (E); while Present (Disc) loop if Chars (Expr) = Chars (Disc) and then Ekind_In (Etype (Disc), - E_Anonymous_Access_Type, - E_Anonymous_Access_Subprogram_Type) + E_Anonymous_Access_Subprogram_Type, + E_Anonymous_Access_Type) then Set_Has_Implicit_Dereference (E); Set_Has_Implicit_Dereference (Disc); diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 8ae620c..942e21e 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -913,8 +913,8 @@ package body Sem_Ch4 is -- the type-checking is similar to that of other calls. procedure Analyze_Call (N : Node_Id) is + Actuals : constant List_Id := Parameter_Associations (N); Loc : constant Source_Ptr := Sloc (N); - Actuals : constant List_Id := Parameter_Associations (N); Nam : Node_Id; X : Interp_Index; It : Interp; @@ -1325,10 +1325,13 @@ package body Sem_Ch4 is then Rewrite (Name (N), Make_Explicit_Dereference (Loc, - Prefix => Make_Selected_Component (Loc, - Prefix => - (New_Occurrence_Of (Entity (Nam), Loc)), - Selector_Name => New_Occurrence_Of (It.Nam, Loc)))); + Prefix => + Make_Selected_Component (Loc, + Prefix => + New_Occurrence_Of (Entity (Nam), Loc), + Selector_Name => + New_Occurrence_Of (It.Nam, Loc)))); + Analyze (N); return; @@ -1342,8 +1345,7 @@ package body Sem_Ch4 is Set_Etype (Nam, It.Typ); end if; - elsif Nkind_In (Name (N), N_Selected_Component, - N_Function_Call) + elsif Nkind_In (Name (N), N_Function_Call, N_Selected_Component) then Remove_Interp (X); end if; diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 062a839..7850a0c 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -2465,11 +2465,11 @@ package body Sem_Res is -- with a name that is an explicit dereference, there is -- nothing to be done at this point. - elsif Nkind_In (N, N_Explicit_Dereference, - N_Attribute_Reference, + elsif Nkind_In (N, N_Attribute_Reference, N_And_Then, - N_Indexed_Component, + N_Explicit_Dereference, N_Identifier, + N_Indexed_Component, N_Or_Else, N_Range, N_Selected_Component, |