diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-12-05 12:16:09 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-12-05 12:16:09 +0100 |
| commit | ce95786742efb57662ba5a27f3da38b3b917c56c (patch) | |
| tree | 93201bf39cb86e56385dbb10972abddf8b0a4371 | |
| parent | 06ad40d3ec3ec2333701f18f6dc6bbf0b9a023ec (diff) | |
| download | gcc-ce95786742efb57662ba5a27f3da38b3b917c56c.zip gcc-ce95786742efb57662ba5a27f3da38b3b917c56c.tar.gz gcc-ce95786742efb57662ba5a27f3da38b3b917c56c.tar.bz2 | |
Minor reformatting.
From-SVN: r194212
| -rw-r--r-- | gcc/ada/exp_prag.adb | 18 | ||||
| -rw-r--r-- | gcc/ada/sem_res.adb | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb index 94ca242..d34322d 100644 --- a/gcc/ada/exp_prag.adb +++ b/gcc/ada/exp_prag.adb @@ -844,15 +844,16 @@ package body Exp_Prag is -- end loop; procedure Expand_Pragma_Loop_Variant (N : Node_Id) is - Last_Var : constant Node_Id := - Last (Pragma_Argument_Associations (N)); - Loc : constant Source_Ptr := Sloc (N); - Curr_Assign : List_Id := No_List; - Flag_Id : Entity_Id := Empty; - If_Stmt : Node_Id := Empty; + Loc : constant Source_Ptr := Sloc (N); + + Last_Var : constant Node_Id := Last (Pragma_Argument_Associations (N)); + + Curr_Assign : List_Id := No_List; + Flag_Id : Entity_Id := Empty; + If_Stmt : Node_Id := Empty; + Old_Assign : List_Id := No_List; Loop_Scop : Entity_Id; Loop_Stmt : Node_Id; - Old_Assign : List_Id := No_List; Variant : Node_Id; procedure Process_Variant (Variant : Node_Id; Is_Last : Boolean); @@ -883,7 +884,6 @@ package body Exp_Prag is begin if Chars (Variant) = Name_Increases then return Make_Op_Gt (Loc, Curr_Val, Old_Val); - else pragma Assert (Chars (Variant) = Name_Decreases); return Make_Op_Lt (Loc, Curr_Val, Old_Val); end if; @@ -959,7 +959,7 @@ package body Exp_Prag is -- Generate: -- Old : <type of Expr>; - Old_Id := Make_Temporary (Loc, 'P'); + Old_Id := Make_Temporary (Loc, 'P'); Insert_Action (Loop_Stmt, Make_Object_Declaration (Loop_Loc, diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index dd07b30..445458c 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -9552,13 +9552,15 @@ package body Sem_Res is -- Skip these type conversion checks if universal fixed operands -- operands involved, since range checks are handled separately for -- these cases (in the appropriate Expand routines in unit Exp_Fixd). - -- Also skip type conversion checks in formal verification mode, as the - -- formal verification backend deals directly with these checks. if Nkind (N) = N_Type_Conversion and then not Is_Generic_Type (Root_Type (Target_Typ)) and then Target_Typ /= Universal_Fixed and then Operand_Typ /= Universal_Fixed + + -- Also skip type conversion checks in formal verification mode, as + -- the formal verification backend deals directly with these checks. + and then not Alfa_Mode then Apply_Type_Conversion_Checks (N); |