[multiple changes]

2010-10-21  Javier Miranda  <miranda@adacore.com>

	* exp_ch5.adb: Update comment.

2010-10-21  Robert Dewar  <dewar@adacore.com>

	* 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

 2010-10-21  Javier Miranda  <miranda@adacore.com>
 
+	* exp_ch5.adb: Update comment.
+
+2010-10-21  Robert Dewar  <dewar@adacore.com>
+
+	* 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  <miranda@adacore.com>
+
 	* sem_attr.adb (Resolve_Attribute): After replacing the range attribute
 	node with a range expression ensure that its evaluation will not have
 	side effects.

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);

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