From 6578a6bfec1ae4a6a077055ebf0024e0079b80f7 Mon Sep 17 00:00:00 2001 From: Hristian Kirtchev Date: Mon, 1 Jul 2019 13:37:42 +0000 Subject: [PATCH] [Ada] Minor reformatting 2019-07-01 Hristian Kirtchev gcc/ada/ * checks.adb, exp_ch9.adb, exp_unst.adb, sem_ch4.adb, sem_prag.adb, sem_spark.adb: Minor reformatting. From-SVN: r272882 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/checks.adb | 8 ++++---- gcc/ada/exp_ch9.adb | 1 + gcc/ada/exp_unst.adb | 14 +++++++------- gcc/ada/sem_ch4.adb | 8 ++++---- gcc/ada/sem_prag.adb | 2 +- gcc/ada/sem_spark.adb | 1 - 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 63ed0d8a0a4..51ff642cdd8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2019-07-01 Hristian Kirtchev + + * checks.adb, exp_ch9.adb, exp_unst.adb, sem_ch4.adb, + sem_prag.adb, sem_spark.adb: Minor reformatting. + 2019-07-01 Ed Schonberg * sem_attr.adb (Analyze_Attribute, case Enum_Rep): Allow prefix diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb index e851c5f702f..33fb27eeec5 100644 --- a/gcc/ada/checks.adb +++ b/gcc/ada/checks.adb @@ -7429,15 +7429,15 @@ package body Checks is return; end if; - -- Entities declared in Lock_free protected types must be treated - -- as volatile, and we must inhibit validity checks to prevent - -- improper constant folding. + -- Entities declared in Lock_free protected types must be treated as + -- volatile, and we must inhibit validity checks to prevent improper + -- constant folding. if Is_Entity_Name (Expr) and then Is_Subprogram (Scope (Entity (Expr))) and then Present (Protected_Subprogram (Scope (Entity (Expr)))) and then Uses_Lock_Free - (Scope (Protected_Subprogram (Scope (Entity (Expr))))) + (Scope (Protected_Subprogram (Scope (Entity (Expr))))) then return; end if; diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index c431e864423..0f83d57fdd8 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -8950,6 +8950,7 @@ package body Exp_Ch9 is Set_Is_Inlined (Protected_Body_Subprogram (Subp)); Set_Is_Inlined (Subp, False); end if; + if Has_Pragma_No_Inline (Subp) then Set_Has_Pragma_No_Inline (Protected_Body_Subprogram (Subp)); end if; diff --git a/gcc/ada/exp_unst.adb b/gcc/ada/exp_unst.adb index f7f488a4e91..b81b1b97a2d 100644 --- a/gcc/ada/exp_unst.adb +++ b/gcc/ada/exp_unst.adb @@ -463,9 +463,9 @@ package body Exp_Unst is Callee : Entity_Id; procedure Check_Static_Type - (T : Entity_Id; - N : Node_Id; - DT : in out Boolean; + (T : Entity_Id; + N : Node_Id; + DT : in out Boolean; Check_Designated : Boolean := False); -- Given a type T, checks if it is a static type defined as a type -- with no dynamic bounds in sight. If so, the only action is to @@ -497,9 +497,9 @@ package body Exp_Unst is ----------------------- procedure Check_Static_Type - (T : Entity_Id; - N : Node_Id; - DT : in out Boolean; + (T : Entity_Id; + N : Node_Id; + DT : in out Boolean; Check_Designated : Boolean := False) is procedure Note_Uplevel_Bound (N : Node_Id; Ref : Node_Id); @@ -702,7 +702,7 @@ package body Exp_Unst is Set_Is_Static_Type (T); end if; - -- For access types, check designated type when required. + -- For access types, check designated type when required elsif Is_Access_Type (T) and then Check_Designated then Check_Static_Type (Directly_Designated_Type (T), N, DT); diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 03a156a3f77..3328f96cfad 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -7402,15 +7402,15 @@ package body Sem_Ch4 is and then Is_Fixed_Point_Type (Etype (L)) and then Is_Integer_Type (Etype (R)) then - Error_Msg_N ("\convert right operand to " - & "`Integer`", N); + Error_Msg_N + ("\convert right operand to `Integer`", N); elsif Nkind (N) = N_Op_Multiply and then Is_Fixed_Point_Type (Etype (R)) and then Is_Integer_Type (Etype (L)) then - Error_Msg_N ("\convert left operand to " - & "`Integer`", N); + Error_Msg_N + ("\convert left operand to `Integer`", N); end if; -- For concatenation operators it is more difficult to diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index ca3603c8ca6..5e7f743aff9 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -25608,7 +25608,7 @@ package body Sem_Prag is Ent := Underlying_Type (Ent); end if; - -- The pragma applies to entities with addresses. + -- The pragma applies to entities with addresses if Is_Type (Ent) then Error_Pragma ("pragma applies to objects and subprograms"); diff --git a/gcc/ada/sem_spark.adb b/gcc/ada/sem_spark.adb index 292c936f803..0040dde325e 100644 --- a/gcc/ada/sem_spark.adb +++ b/gcc/ada/sem_spark.adb @@ -47,7 +47,6 @@ package body Sem_SPARK is --------------------------------------------------- package Permissions is - Elaboration_Context_Max : constant := 1009; -- The hash range -- 2.30.2