public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Pierre-Marie de Rodat <pmderodat@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-5040] [Ada] Do not indicate a pending abort if the task is already aborting
Date: Tue,  9 Nov 2021 09:47:32 +0000 (GMT)	[thread overview]
Message-ID: <20211109094732.2FB503858001@sourceware.org> (raw)

https://gcc.gnu.org/g:09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92

commit r12-5040-g09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92
Author: Patrick Bernardi <bernardi@adacore.com>
Date:   Thu Oct 28 18:05:16 2021 -0400

    [Ada] Do not indicate a pending abort if the task is already aborting
    
    gcc/ada/
    
            * libgnarl/s-tasini.adb (Check_Abort_Status): Don't return 1 if
            the task is aborting.
            * libgnarl/s-tasini.ads (Check_Abort_Status): Update comment.

Diff:
---
 gcc/ada/libgnarl/s-tasini.adb | 1 +
 gcc/ada/libgnarl/s-tasini.ads | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/ada/libgnarl/s-tasini.adb b/gcc/ada/libgnarl/s-tasini.adb
index 9acfa4927d6..8d242ee33c1 100644
--- a/gcc/ada/libgnarl/s-tasini.adb
+++ b/gcc/ada/libgnarl/s-tasini.adb
@@ -126,6 +126,7 @@ package body System.Tasking.Initialization is
       if Self_ID /= null
         and then Self_ID.Deferral_Level = 0
         and then Self_ID.Pending_ATC_Level < Self_ID.ATC_Nesting_Level
+        and then not Self_ID.Aborting
       then
          return 1;
       else
diff --git a/gcc/ada/libgnarl/s-tasini.ads b/gcc/ada/libgnarl/s-tasini.ads
index f35df576e68..a551d246650 100644
--- a/gcc/ada/libgnarl/s-tasini.ads
+++ b/gcc/ada/libgnarl/s-tasini.ads
@@ -115,7 +115,7 @@ package System.Tasking.Initialization is
 
    function Check_Abort_Status return Integer;
    --  Returns Boolean'Pos (True) iff abort signal should raise
-   --  Standard'Abort_Signal. Only used by IRIX currently.
+   --  Standard'Abort_Signal. Only used by RTEMS currently.
 
    --------------------------
    -- Change Base Priority --


                 reply	other threads:[~2021-11-09  9:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211109094732.2FB503858001@sourceware.org \
    --to=pmderodat@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).