public inbox for libstdc++@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Cc: Thomas Rodgers <trodgers@redhat.com>
Subject: [committed] libstdc++: Add missing return for atomic timed wait [PR102074]
Date: Tue, 31 Aug 2021 17:49:32 +0100	[thread overview]
Message-ID: <YS5dnBFGzsekzaKQ@redhat.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

This adds a missing return statement to the non-futex wait-until
operation.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	PR libstdc++/102074
	* include/bits/atomic_timed_wait.h (__timed_waiter_pool)
	[!_GLIBCXX_HAVE_PLATFORM_TIMED_WAIT]: Add missing return.

Tested powerpc64le-linux and power-aix and sparc-solaris.

Committed to trunk.

We think there's another issue with return values for the futex case,
which we'll fix separately.


[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1046 bytes --]

commit 763eb1f19239ebb19c0f87590a4f02300c02c52b
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Aug 31 16:50:17 2021

    libstdc++: Add missing return for atomic timed wait [PR102074]
    
    This adds a missing return statement to the non-futex wait-until
    operation.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/102074
            * include/bits/atomic_timed_wait.h (__timed_waiter_pool)
            [!_GLIBCXX_HAVE_PLATFORM_TIMED_WAIT]: Add missing return.

diff --git a/libstdc++-v3/include/bits/atomic_timed_wait.h b/libstdc++-v3/include/bits/atomic_timed_wait.h
index ec7ff51cdbc..3db08f82707 100644
--- a/libstdc++-v3/include/bits/atomic_timed_wait.h
+++ b/libstdc++-v3/include/bits/atomic_timed_wait.h
@@ -213,6 +213,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	      lock_guard<mutex> __l(_M_mtx);
 	      return __cond_wait_until(_M_cv, _M_mtx, __atime);
 	    }
+	  else
+	    return true;
 #endif // _GLIBCXX_HAVE_PLATFORM_TIMED_WAIT
 	}
     };

                 reply	other threads:[~2021-08-31 16:49 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=YS5dnBFGzsekzaKQ@redhat.com \
    --to=jwakely@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libstdc++@gcc.gnu.org \
    --cc=trodgers@redhat.com \
    /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).