s-tposen.adb (Service_Entry): The object must be always unlocked at the end of this...

2004-10-04  Jose Ruiz  <ruiz@act-europe.fr>

	* s-tposen.adb (Service_Entry): The object must be always unlocked at
	the end of this procedure now that the unlock operation was inserted
	by the expander.

From-SVN: r88489

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f34a3a4b672060a74a20fcb3ec24b96c377af4f0..898395faa6ad2d1d29d81c7bf2a4b8da1f57fe96 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-04  Jose Ruiz  <ruiz@act-europe.fr>
+
+       * s-tposen.adb (Service_Entry): The object must be always unlocked at
+       the end of this procedure now that the unlock operation was inserted
+       by the expander.
+
 2004-10-04  Jose Ruiz  <ruiz@act-europe.fr>
 
        * targparm.ads, targparm.adb (Targparm_Tags): Add PAS value

diff --git a/gcc/ada/s-tposen.adb b/gcc/ada/s-tposen.adb
index a992ed1df0f018eb265121673ffaf3d096c310df..bb1267969c1ce4cd50b31a6eb8283fd0790f4cec 100644 (file)
--- a/gcc/ada/s-tposen.adb
+++ b/gcc/ada/s-tposen.adb
@@ -574,43 +574,48 @@ package body System.Tasking.Protected_Objects.Single_Entry is
    -------------------
 
    procedure Service_Entry (Object : Protection_Entry_Access) is
-      Self_Id       : constant Task_Id := STPO.Self;
-      Entry_Call    : constant Entry_Call_Link := Object.Entry_Queue;
-      Caller        : Task_Id;
+      Self_Id    : constant Task_Id := STPO.Self;
+      Entry_Call : constant Entry_Call_Link := Object.Entry_Queue;
+      Caller     : Task_Id;
 
    begin
-      if Entry_Call /= null then
-         if Object.Entry_Body.Barrier (Object.Compiler_Info, 1) then
-            Object.Entry_Queue := null;
+      if Entry_Call /= null
+        and then Object.Entry_Body.Barrier (Object.Compiler_Info, 1)
+      then
+         Object.Entry_Queue := null;
 
-            if Object.Call_In_Progress /= null then
-               --  This violates the No_Entry_Queue restriction, send
-               --  Program_Error to the caller.
+         if Object.Call_In_Progress /= null then
 
-               Send_Program_Error (Self_Id, Entry_Call);
-               Unlock_Entry (Object);
-               return;
-            end if;
+            --  Violation of No_Entry_Queue restriction, raise exception
 
-            Object.Call_In_Progress := Entry_Call;
-            Object.Entry_Body.Action
-              (Object.Compiler_Info, Entry_Call.Uninterpreted_Data, 1);
-            Object.Call_In_Progress := null;
-            Caller := Entry_Call.Self;
+            Send_Program_Error (Self_Id, Entry_Call);
             Unlock_Entry (Object);
+            return;
+         end if;
 
-            if Single_Lock then
-               STPO.Lock_RTS;
-            end if;
+         Object.Call_In_Progress := Entry_Call;
+         Object.Entry_Body.Action
+           (Object.Compiler_Info, Entry_Call.Uninterpreted_Data, 1);
+         Object.Call_In_Progress := null;
+         Caller := Entry_Call.Self;
+         Unlock_Entry (Object);
 
-            STPO.Write_Lock (Caller);
-            Wakeup_Entry_Caller (Self_Id, Entry_Call, Done);
-            STPO.Unlock (Caller);
+         if Single_Lock then
+            STPO.Lock_RTS;
+         end if;
 
-            if Single_Lock then
-               STPO.Unlock_RTS;
-            end if;
+         STPO.Write_Lock (Caller);
+         Wakeup_Entry_Caller (Self_Id, Entry_Call, Done);
+         STPO.Unlock (Caller);
+
+         if Single_Lock then
+            STPO.Unlock_RTS;
          end if;
+
+      else
+         --  Just unlock the entry
+
+         Unlock_Entry (Object);
       end if;
 
    exception