From 5162533940dff83f0a39246d1337a8ca090f3250 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 21 Oct 2010 11:58:50 +0200 Subject: [PATCH] [multiple changes] 2010-10-21 Javier Miranda * exp_ch5.adb: Update comment. 2010-10-21 Robert Dewar * sem_ch13.adb (Build_Invariant_Procedure): Remove commented out code for interfaces, since invariants are not allowed on interfaces in any case. From-SVN: r165758 --- gcc/ada/ChangeLog | 10 ++++++++++ gcc/ada/exp_ch5.adb | 4 ++-- gcc/ada/sem_ch13.adb | 22 ---------------------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 76b69a1c308..6677b860388 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2010-10-21 Javier Miranda + + * exp_ch5.adb: Update comment. + +2010-10-21 Robert Dewar + + * sem_ch13.adb (Build_Invariant_Procedure): Remove commented out code + for interfaces, since invariants are not allowed on interfaces in any + case. + 2010-10-21 Javier Miranda * sem_attr.adb (Resolve_Attribute): After replacing the range attribute diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb index 7c69d5e634e..42fcf151c69 100644 --- a/gcc/ada/exp_ch5.adb +++ b/gcc/ada/exp_ch5.adb @@ -562,8 +562,8 @@ package body Exp_Ch5 is -- cannot assign to elements of the array without this extra -- unchecked conversion. - -- Note: We must propagate Parent to the conversion node to allow - -- climbing the subtree if Insert_Action is invoked later. + -- Note: We propagate Parent to the conversion nodes to generate + -- a well-formed subtree. if Nkind (Act_Lhs) = N_Slice then Larray := Prefix (Act_Lhs); diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index fcef81dc113..88acedf258f 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -3679,28 +3679,6 @@ package body Sem_Ch13 is end loop; end; - -- Add invariants for inherited interfaces - -- (commented out because it blows up on simpleinv in J701-022) - --- declare --- Ifaces : Elist_Id; --- Iface : Elmt_Id; --- --- begin --- Collect_Interfaces --- (T => Typ, --- Ifaces_List => Ifaces, --- Exclude_Parents => True, --- Use_Full_View => True); --- --- loop --- Iface := First_Elmt (Ifaces); --- exit when Iface = No_Elmt; --- Add_Invariants (Node (Iface), Inherit => True); --- Remove_Elmt (Ifaces, Iface); --- end loop; --- end; - -- Build the procedure if we generated at least one Check pragma if Stmts /= No_List then -- 2.30.2