[patch] libstdc++/33394 add testcase

[patch] libstdc++/33394 add testcase

[Jonathan Wakely]

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

Adding a testcase so the bug can be closed.

I believe the segfault was fixed for 3.4.0 by
https://gcc.gnu.org/r67912

Tested x86_64-linux, committed to trunk.


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

commit c2ae41d5312dce3b4b81653efba477b232dd39f1
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Mar 24 14:31:58 2015 +0000

    	PR libstdc++/33394
    	* testsuite/21_strings/basic_string/pthread33394.cc: Add test.

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc b/libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc
new file mode 100644
index 0000000..c706504
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc
@@ -0,0 +1,49 @@
+// Copyright (C) 2015 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 run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* } }
+
+// { dg-options "-DITERATIONS=1000" { target simulator } }
+#ifndef ITERATIONS
+#define ITERATIONS 50000
+#endif
+
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32261
+
+#include <pthread.h>
+#include <string>
+
+extern "C" void* thread_function(void*) {
+    for (int k = 0; k < ITERATIONS; k++) {
+        std::string my_str;
+        my_str += "foo";
+    }
+    return 0;
+}
+
+int main()
+{
+    pthread_t thread1, thread2;
+
+    pthread_create(&thread1, NULL, thread_function, NULL);
+    pthread_create(&thread2, NULL, thread_function, NULL);
+
+    void* exitcode;
+    pthread_join(thread1, &exitcode);
+    pthread_join(thread2, &exitcode);
+}

[Obvious] Fix libstdc++/33394 testcase when cross-testing linux

[Alan Lawrence]

When cross-testing, the -DITERATIONS=1000 flag replaced the -pthread required 
for linux targets, so the test failed to build. I've pushed the following test 
fix as r221666:

Index: libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc
===================================================================
--- libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc 
(revision 221665)
+++ libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc      (working 
copy)
@@ -18,7 +18,7 @@
  // { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* 
*-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
  // { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* 
*-*-linux* *-*-gnu* *-*-solaris* } }

-// { dg-options "-DITERATIONS=1000" { target simulator } }
+// { dg-additional-options "-DITERATIONS=1000" { target simulator } }
  #ifndef ITERATIONS
  #define ITERATIONS 50000
  #endif

Jonathan Wakely wrote:
> Adding a testcase so the bug can be closed.
> 
> I believe the segfault was fixed for 3.4.0 by
> https://gcc.gnu.org/r67912
> 
> Tested x86_64-linux, committed to trunk.

Re: [Obvious] Fix libstdc++/33394 testcase when cross-testing linux

[Jonathan Wakely]

On 25/03/15 15:49 +0000, Alan Lawrence wrote:
>When cross-testing, the -DITERATIONS=1000 flag replaced the -pthread 
>required for linux targets, so the test failed to build. I've pushed 
>the following test fix as r221666:

Ah yes, of course it does! Thanks for the fix.

>Index: libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc
>===================================================================
>--- libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc 
>(revision 221665)
>+++ libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc      
>(working copy)
>@@ -18,7 +18,7 @@
> // { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* 
>*-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
> // { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* 
>*-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* } }
>
>-// { dg-options "-DITERATIONS=1000" { target simulator } }
>+// { dg-additional-options "-DITERATIONS=1000" { target simulator } }
> #ifndef ITERATIONS
> #define ITERATIONS 50000
> #endif
>
>Jonathan Wakely wrote:
>>Adding a testcase so the bug can be closed.
>>
>>I believe the segfault was fixed for 3.4.0 by
>>https://gcc.gnu.org/r67912
>>
>>Tested x86_64-linux, committed to trunk.
>