OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bindgen.adb, [...]: Minor reformatting. 

2016-06-16  Hristian Kirtchev  <kirtchev@adacore.com>

	* bindgen.adb, exp_util.adb, sem_ch9.adb, sem_util.adb: Minor
	reformatting.

From-SVN: r237510
This commit is contained in:
Hristian Kirtchev 2016-06-16 10:12:26 +00:00 committed by Arnaud Charlet
parent 3ab53b0db9
commit 3455747810
5 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2016-06-16 Hristian Kirtchev <kirtchev@adacore.com>
* bindgen.adb, exp_util.adb, sem_ch9.adb, sem_util.adb: Minor
reformatting.
2016-06-16 Gary Dismukes <dismukes@adacore.com>
* sem_ch9.adb, sem_util.ads, sem_res.adb: Minor reformatting and typo

1
gcc/ada/bindgen.adb
View File

@ -931,6 +931,7 @@ package body Bindgen is
Gen_Elab_Calls;
if not CodePeer_Mode then
-- Call System.Elaboration_Allocators.Mark_Start_Of_Elaboration if
-- restriction No_Standard_Allocators_After_Elaboration is active.

4
gcc/ada/exp_util.adb
View File

@ -4721,8 +4721,8 @@ package body Exp_Util is
begin
-- When a function call appears in Object.Operation format, the
-- original representation has three possible forms depending on the
-- availability and form of actual parameters:
-- original representation has several possible forms depending on
-- the availability and form of actual parameters:
-- Obj.Func N_Selected_Component
-- Obj.Func (Actual) N_Indexed_Component

6
gcc/ada/sem_ch9.adb
View File

@ -1986,10 +1986,10 @@ package body Sem_Ch9 is
end if;
Set_Ekind (T, E_Protected_Type);
Set_Is_First_Subtype (T, True);
Set_Is_First_Subtype (T);
Init_Size_Align (T);
Set_Etype (T, T);
Set_Has_Delayed_Freeze (T, True);
Set_Has_Delayed_Freeze (T);
Set_Stored_Constraint (T, No_Elist);
-- Mark this type as a protected type for the sake of restrictions,
@ -2006,7 +2006,7 @@ package body Sem_Ch9 is
then
Set_Has_Protected (T, False);
else
Set_Has_Protected (T, True);
Set_Has_Protected (T);
end if;
-- Set the SPARK_Mode from the current context (may be overwritten later

60
gcc/ada/sem_util.adb
View File

@ -10391,16 +10391,40 @@ package body Sem_Util is
----------------------------------
procedure Replace_Null_By_Null_Address (N : Node_Id) is
procedure Replace_Null_Operand (Op : Node_Id; Other_Op : Node_Id);
-- Replace operand Op with a reference to Null_Address when the operand
-- denotes a null Address. Other_Op denotes the other operand.
--------------------------
-- Replace_Null_Operand --
--------------------------
procedure Replace_Null_Operand (Op : Node_Id; Other_Op : Node_Id) is
begin
-- Check the type of the complementary operand since the N_Null node
-- has not been decorated yet.
if Nkind (Op) = N_Null
and then Is_Descendant_Of_Address (Etype (Other_Op))
then
Rewrite (Op, New_Occurrence_Of (RTE (RE_Null_Address), Sloc (Op)));
end if;
end Replace_Null_Operand;
-- Start of processing for Replace_Null_By_Null_Address
begin
pragma Assert (Relaxed_RM_Semantics);
pragma Assert
(Nkind (N) = N_Null
or else Nkind_In (N, N_Op_Eq, N_Op_Ne)
or else Nkind_In (N, N_Op_Lt, N_Op_Le, N_Op_Gt, N_Op_Ge));
pragma Assert (Nkind_In (N, N_Null,
N_Op_Eq,
N_Op_Ge,
N_Op_Gt,
N_Op_Le,
N_Op_Lt,
N_Op_Ne));
if Nkind (N) = N_Null then
Rewrite (N,
New_Occurrence_Of (RTE (RE_Null_Address), Sloc (N)));
Rewrite (N, New_Occurrence_Of (RTE (RE_Null_Address), Sloc (N)));
else
declare
@ -10408,22 +10432,8 @@ package body Sem_Util is
R : constant Node_Id := Right_Opnd (N);
begin
-- We check the Etype of the complementary operand since the
-- N_Null node is not decorated at this stage.
if Nkind (L) = N_Null
and then Is_Descendant_Of_Address (Etype (R))
then
Rewrite (L,
New_Occurrence_Of (RTE (RE_Null_Address), Sloc (L)));
end if;
if Nkind (R) = N_Null
and then Is_Descendant_Of_Address (Etype (L))
then
Rewrite (R,
New_Occurrence_Of (RTE (RE_Null_Address), Sloc (R)));
end if;
Replace_Null_Operand (L, Other_Op => R);
Replace_Null_Operand (R, Other_Op => L);
end;
end if;
end Replace_Null_By_Null_Address;
@ -17535,7 +17545,8 @@ package body Sem_Util is
function Null_To_Null_Address_Convert_OK
(N : Node_Id;
Typ : Entity_Id := Empty) return Boolean is
Typ : Entity_Id := Empty) return Boolean
is
begin
if not Relaxed_RM_Semantics then
return False;
@ -17544,8 +17555,7 @@ package body Sem_Util is
if Nkind (N) = N_Null then
return Present (Typ) and then Is_Descendant_Of_Address (Typ);
elsif Nkind_In (N, N_Op_Eq, N_Op_Ne)
or else Nkind_In (N, N_Op_Lt, N_Op_Le, N_Op_Gt, N_Op_Ge)
elsif Nkind_In (N, N_Op_Eq, N_Op_Ge, N_Op_Gt, N_Op_Le, N_Op_Lt, N_Op_Ne)
then
declare
L : constant Node_Id := Left_Opnd (N);