procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exp_ch3.adb (Build_Init_Procedure): Complete the condition of an if-stmt to match its current documentation.

Browse source 
2014-10-10  Javier Miranda  <miranda@adacore.com>

	* exp_ch3.adb (Build_Init_Procedure): Complete the condition of an
	if-stmt to match its current documentation.

From-SVN: r216080
This commit is contained in:
Javier Miranda 2014-10-10 13:23:22 +00:00 • committed by Arnaud Charlet
parent 5e396da6b4
commit d56f4479e6
2 changed files with 13 additions and 14 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 @@
2014-10-10 Javier Miranda <miranda@adacore.com>
* exp_ch3.adb (Build_Init_Procedure): Complete the condition of an
if-stmt to match its current documentation.
2014-10-10 Robert Dewar <dewar@adacore.com>
* sem_ch7.adb, einfo.adb, einfo.ads, sem_prag.adb, sem_ch12.adb,

22
gcc/ada/exp_ch3.adb
View file

@ -2371,16 +2371,11 @@ package body Exp_Ch3 is
-- such case the initialization of the _parent field was not
-- generated.
if not Is_Interface (Etype (Rec_Ent)) then
declare
First_Stmt : constant Node_Id := Remove_Head (Stmts);
begin
pragma Assert
(Nkind (First_Stmt) = N_Procedure_Call_Statement
and then
Is_Init_Proc (Name (First_Stmt)));
Prepend_To (Body_Stmts, First_Stmt);
end;
if not Is_Interface (Etype (Rec_Ent))
and then Nkind (First (Stmts)) = N_Procedure_Call_Statement
and then Is_Init_Proc (Name (First (Stmts)))
then
Prepend_To (Body_Stmts, Remove_Head (Stmts));
end if;
Append_List_To (Body_Stmts, Stmts);
@ -2664,9 +2659,9 @@ package body Exp_Ch3 is
function Build_Init_Statements (Comp_List : Node_Id) return List_Id is
Checks : constant List_Id := New_List;
Actions : List_Id := No_List;
Actions : List_Id := No_List;
Counter_Id : Entity_Id := Empty;
Comp_Loc : Source_Ptr;
Counter_Id : Entity_Id := Empty;
Decl : Node_Id;
Has_POC : Boolean;
Id : Entity_Id;
@ -2980,8 +2975,7 @@ package body Exp_Ch3 is
else
Append_List_To (Stmts, Actions);
-- Preserve the initialization state in the current
-- counter
-- Preserve initialization state in the current counter
if Needs_Finalization (Typ) then
if No (Counter_Id) then