From: Ghjuvan Lacambre <lacambre@adacore.com>
Date: Tue, 16 Nov 2021 13:19:07 +0000 (+0100)
Subject: [Ada] Make Timed_Task_Entry_Call's defer_abort nestable
X-Git-Tag: basepoints/gcc-13~2640
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbdb6b93a2808d5c3d518e9675d058fab3b8f89b;p=thirdparty%2Fgcc.git

[Ada] Make Timed_Task_Entry_Call's defer_abort nestable

gcc/ada/

	* libgnarl/s-tasren.adb (Timed_Task_Entry_Call): Replace
	Defer_Abort and Undefer_Abort with Defer_Abort_Nestable and
	Undefer_Abort_Nestable.
---

diff --git a/gcc/ada/libgnarl/s-tasren.adb b/gcc/ada/libgnarl/s-tasren.adb
index 9498ca0db5c9..fa10b0cbbbe6 100644
--- a/gcc/ada/libgnarl/s-tasren.adb
+++ b/gcc/ada/libgnarl/s-tasren.adb
@@ -1452,7 +1452,7 @@ package body System.Tasking.Rendezvous is
            "potentially blocking operation";
       end if;
 
-      Initialization.Defer_Abort (Self_Id);
+      Initialization.Defer_Abort_Nestable (Self_Id);
       Self_Id.ATC_Nesting_Level := Self_Id.ATC_Nesting_Level + 1;
 
       pragma Debug
@@ -1487,7 +1487,7 @@ package body System.Tasking.Rendezvous is
          STPO.Write_Lock (Self_Id);
          Utilities.Exit_One_ATC_Level (Self_Id);
          STPO.Unlock (Self_Id);
-         Initialization.Undefer_Abort (Self_Id);
+         Initialization.Undefer_Abort_Nestable (Self_Id);
 
          raise Tasking_Error;
       end if;
@@ -1500,7 +1500,7 @@ package body System.Tasking.Rendezvous is
       --  ??? Do we need to yield in case Yielded is False
 
       Rendezvous_Successful := Entry_Call.State = Done;
-      Initialization.Undefer_Abort (Self_Id);
+      Initialization.Undefer_Abort_Nestable (Self_Id);
       Entry_Calls.Check_Exception (Self_Id, Entry_Call);
    end Timed_Task_Entry_Call;