[committed] libstdc++: Fix call to __glibcxx_rwlock_init (PR 93244)

Message ID 20200306120443.GA3217321@redhat.com
State New
Headers show
Series
  • [committed] libstdc++: Fix call to __glibcxx_rwlock_init (PR 93244)
Related show

Commit Message

Jonathan Wakely March 6, 2020, 12:04 p.m.
When the target doesn't define PTHREAD_RWLOCK_INITIALIZER we use a
wrapper around pthread_wrlock_init, but the wrapper only takes one
argument and we try to call it with two.

This went unnnoticed on most targets because they do define the
PTHREAD_RWLOCK_INITIALIZER macro, but it causes a bootstrap failure on
darwin8.

	PR libstdc++/93244
	* include/std/shared_mutex [!PTHREAD_RWLOCK_INITIALIZER]
	(__shared_mutex_pthread::__shared_mutex_pthread()): Remove incorrect
	second argument to __glibcxx_rwlock_init.
	* testsuite/30_threads/shared_timed_mutex/94069.cc: New test.

Tested powerpc64le-linux, committed to master.

This also needs to be backported to gcc-9 but I'll let the release
managers decide whether that's before or after the upcoming 9.3
release.
commit b0815713a32c5cc062bd41fa75dac4d4408215fb
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Mar 6 12:03:17 2020 +0000

    libstdc++: Fix call to __glibcxx_rwlock_init (PR 93244)
    
    When the target doesn't define PTHREAD_RWLOCK_INITIALIZER we use a
    wrapper around pthread_wrlock_init, but the wrapper only takes one
    argument and we try to call it with two.
    
    This went unnnoticed on most targets because they do define the
    PTHREAD_RWLOCK_INITIALIZER macro, but it causes a bootstrap failure on
    darwin8.
    
            PR libstdc++/93244
            * include/std/shared_mutex [!PTHREAD_RWLOCK_INITIALIZER]
            (__shared_mutex_pthread::__shared_mutex_pthread()): Remove incorrect
            second argument to __glibcxx_rwlock_init.
            * testsuite/30_threads/shared_timed_mutex/94069.cc: New test.

Comments

Jonathan Wakely March 6, 2020, 12:25 p.m. | #1
On 06/03/20 12:04 +0000, Jonathan Wakely wrote:
>When the target doesn't define PTHREAD_RWLOCK_INITIALIZER we use a

>wrapper around pthread_wrlock_init, but the wrapper only takes one

>argument and we try to call it with two.

>

>This went unnnoticed on most targets because they do define the

>PTHREAD_RWLOCK_INITIALIZER macro, but it causes a bootstrap failure on

>darwin8.

>

>	PR libstdc++/93244

>	* include/std/shared_mutex [!PTHREAD_RWLOCK_INITIALIZER]

>	(__shared_mutex_pthread::__shared_mutex_pthread()): Remove incorrect

>	second argument to __glibcxx_rwlock_init.

>	* testsuite/30_threads/shared_timed_mutex/94069.cc: New test.

>

>Tested powerpc64le-linux, committed to master.

>

>This also needs to be backported to gcc-9 but I'll let the release

>managers decide whether that's before or after the upcoming 9.3

>release.

>

>


>commit b0815713a32c5cc062bd41fa75dac4d4408215fb

>Author: Jonathan Wakely <jwakely@redhat.com>

>Date:   Fri Mar 6 12:03:17 2020 +0000

>

>    libstdc++: Fix call to __glibcxx_rwlock_init (PR 93244)

>

>    When the target doesn't define PTHREAD_RWLOCK_INITIALIZER we use a

>    wrapper around pthread_wrlock_init, but the wrapper only takes one

>    argument and we try to call it with two.

>

>    This went unnnoticed on most targets because they do define the

>    PTHREAD_RWLOCK_INITIALIZER macro, but it causes a bootstrap failure on

>    darwin8.

>

>            PR libstdc++/93244


Oops, the correct PR number is 94069. Fixed in the ChangeLog now.

Patch

diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex
index 1d0ce673a76..9b597e76299 100644
--- a/libstdc++-v3/include/std/shared_mutex
+++ b/libstdc++-v3/include/std/shared_mutex
@@ -160,7 +160,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   public:
     __shared_mutex_pthread()
     {
-      int __ret = __glibcxx_rwlock_init(&_M_rwlock, NULL);
+      int __ret = __glibcxx_rwlock_init(&_M_rwlock);
       if (__ret == ENOMEM)
 	__throw_bad_alloc();
       else if (__ret == EAGAIN)
diff --git a/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/94069.cc b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/94069.cc
new file mode 100644
index 00000000000..6e5cf5f0c6e
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/shared_timed_mutex/94069.cc
@@ -0,0 +1,28 @@ 
+// Copyright (C) 2020 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do compile }
+// { dg-options "-pthread"  }
+// { dg-require-effective-target c++14 }
+// { dg-require-effective-target pthread }
+// { dg-require-gthreads "" }
+//
+#include <pthread.h>
+// This is probably undefined, but we do it to simulate a Pthreads target
+// that doesn't define the macro:
+#undef PTHREAD_RWLOCK_INITIALIZER
+#include <shared_mutex>