[multiple changes]

2013-04-11  Thomas Quinot  <quinot@adacore.com>

	* exp_ch4.adb (Find_Enclosing_Context): Add missing case of
	N_Procedure_Call_Statement.

2013-04-11  Robert Dewar  <dewar@adacore.com>

	* debug.adb: Minor comment fix.

From-SVN: r197748

gcc/ada/ChangeLog

+2013-04-11  Thomas Quinot  <quinot@adacore.com>
+
+	* exp_ch4.adb (Find_Enclosing_Context): Add missing case of
+	N_Procedure_Call_Statement.
+
+2013-04-11  Robert Dewar  <dewar@adacore.com>
+
+	* debug.adb: Minor comment fix.
+
 2013-04-11  Johannes Kanig  <kanig@adacore.com>
 
 	* debug.adb: Remove comment for -gnatd.G.

gcc/ada/debug.adb

@@ -605,10 +605,6 @@ package body Debug is
    --       as well as additional cross reference information in ALI files to
    --       compute effects of subprograms.
 
-   --  d.G  Precondition only mode for gnat2why. In this mode, gnat2why will
-   --       only generate Why code that checks for the well-guardedness of
-   --       preconditions.
-
    --  d.H  Standard package only mode for gnat2why. In this mode, gnat2why
    --       will only generate Why code for package Standard. Any given input
    --       file will be ignored.

gcc/ada/exp_ch4.adb

@@ -5137,11 +5137,16 @@ package body Exp_Ch4 is
 
                   --    return ... and then Ctrl_Func_Call ...;
 
+                  --  Yet another case: a formal in a procedure call statement:
+
+                  --    Proc (... and then Ctrl_Func_Call ...);
+
                   while Present (Par) loop
                      if Nkind_In (Par, N_Assignment_Statement,
                                        N_Object_Declaration,
                                        N_Pragma,
-                                       N_Simple_Return_Statement)
+                                       N_Simple_Return_Statement,
+                                       N_Procedure_Call_Statement)
                      then
                         return Par;
 
@@ -10899,9 +10904,9 @@ package body Exp_Ch4 is
 
       function Element_To_Compare (C : Entity_Id) return Entity_Id is
          Comp : Entity_Id;
+
       begin
          Comp := C;
-
          loop
             --  Exit loop when the next element to be compared is found, or
             --  there is no more such element.
@@ -10919,7 +10924,7 @@ package body Exp_Ch4 is
               --  inherited components only.
 
               (Is_Tagged_Type (Typ)
-                 and then Comp /= Original_Record_Component (Comp))
+                and then Comp /= Original_Record_Component (Comp))
 
               --  Skip _Tag
 
@@ -10931,8 +10936,8 @@ package body Exp_Ch4 is
               --  .NET/JVM, skip _Parent whenever it has type Root_Controlled.
 
               or else (Chars (Comp) = Name_uParent
-                and then VM_Target /= No_VM
-                and then Etype (Comp) = RTE (RE_Root_Controlled))
+                        and then VM_Target /= No_VM
+                        and then Etype (Comp) = RTE (RE_Root_Controlled))
 
               --  Skip interface elements (secondary tags???)