[multiple changes]

2010-06-18  Ed Schonberg  <schonberg@adacore.com>

	* freeze.adb (Build_And_Analyze_Renamed_Body): If the renaming
	declaration appears in the same unit and ealier than the renamed
	entity, retain generated body to prevent order-of-elaboration issues in
	gigi.

2010-06-18  Arnaud Charlet  <charlet@adacore.com>

	* s-tpoben.adb: Update comments.

2010-06-18  Robert Dewar  <dewar@adacore.com>

	* debug.adb: Minor comment change.

From-SVN: r161010

1 files changed, 5 insertions, 5 deletions

diff --git a/gcc/ada/s-tpoben.adb b/gcc/ada/s-tpoben.adb
index 4694310ebff..ba2bf6c267a 100644
--- a/gcc/ada/s-tpoben.adb
+++ b/gcc/ada/s-tpoben.adb
@@ -226,12 +226,12 @@ package body System.Tasking.Protected_Objects.Entries is
          raise Program_Error;
       end if;
 
-      --  pragma Assert (Self_Id.Deferral_Level = 0);
       --  If a PO is created from a controlled operation, abort is already
-      --  deferred at this point, so we need to use Defer_Abort_Nestable
-      --  In some cases, the above assertion can be useful to spot
-      --  inconsistencies, outside the above scenario involving controlled
-      --  types.
+      --  deferred at this point, so we need to use Defer_Abort_Nestable. In
+      --  some cases, the following assertion can help to spot inconsistencies,
+      --  outside the above scenario involving controlled types.
+
+      --  pragma Assert (Self_Id.Deferral_Level = 0);
 
       Initialization.Defer_Abort_Nestable (Self_ID);
       Initialize_Lock (Init_Priority, Object.L'Access);