From: Benjamin Kosnik Date: Fri, 1 Jun 2007 17:03:22 +0000 (+0000) Subject: what-big.cc: New. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e984b909c70311d593cc3a79bf6f5afe7b79157;p=gcc.git what-big.cc: New. 2007-06-01 Benjamin Kosnik * testsuite/19_diagnostics/logic_error/what-big.cc: New. * testsuite/19_diagnostics/logic_error/what-3.cc: Same. * testsuite/19_diagnostics/runtime_error/what-big.cc: Same. * testsuite/19_diagnostics/runtime_error/what-3.cc: Same. * testsuite/18_support/14493.cc: Break into... * testsuite/18_support/exception/what.cc: ...this. * testsuite/18_support/bad_cast/what.cc: ...this. * testsuite/18_support/bad_alloc/what.cc: ...this. * testsuite/18_support/bad_typeid/what.cc: ...this. * testsuite/18_support/bad_exception/what.cc: ...this. * testsuite/19_diagnostics/bad_exception/23591_thread-1.c: Move... * testsuite/18_support/bad_exception/23591_thread-1.c: ...here. * testsuite/18_support/14026.cc: Move... * testsuite/18_support/uncaught_exception/14026.cc: ...here. From-SVN: r125267 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 463cbf6304c..6507c5f63aa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,23 @@ +2007-06-01 Benjamin Kosnik + + * testsuite/19_diagnostics/logic_error/what-big.cc: New. + * testsuite/19_diagnostics/logic_error/what-3.cc: Same. + * testsuite/19_diagnostics/runtime_error/what-big.cc: Same. + * testsuite/19_diagnostics/runtime_error/what-3.cc: Same. + + * testsuite/18_support/14493.cc: Break into... + * testsuite/18_support/exception/what.cc: ...this. + * testsuite/18_support/bad_cast/what.cc: ...this. + * testsuite/18_support/bad_alloc/what.cc: ...this. + * testsuite/18_support/bad_typeid/what.cc: ...this. + * testsuite/18_support/bad_exception/what.cc: ...this. + + * testsuite/19_diagnostics/bad_exception/23591_thread-1.c: Move... + * testsuite/18_support/bad_exception/23591_thread-1.c: ...here. + + * testsuite/18_support/14026.cc: Move... + * testsuite/18_support/uncaught_exception/14026.cc: ...here. + 2007-06-01 Benjamin Kosnik * include/ext/throw_allocator.h (__throw_allocator::allocate): diff --git a/libstdc++-v3/testsuite/18_support/14026.cc b/libstdc++-v3/testsuite/18_support/14026.cc deleted file mode 100644 index 103ac64a9d7..00000000000 --- a/libstdc++-v3/testsuite/18_support/14026.cc +++ /dev/null @@ -1,34 +0,0 @@ -// PR 14026 -// 18.6.4 uncaught_exception - -#include -#include -#include - -static void -no_uncaught () -{ - if (std::uncaught_exception ()) - abort (); -} - -int -main () -{ - try - { - throw 1; - } - catch (...) - { - try - { - throw; - } - catch (...) - { - no_uncaught (); - } - } - no_uncaught (); -} diff --git a/libstdc++-v3/testsuite/18_support/14493.cc b/libstdc++-v3/testsuite/18_support/14493.cc deleted file mode 100644 index 188bad7d497..00000000000 --- a/libstdc++-v3/testsuite/18_support/14493.cc +++ /dev/null @@ -1,53 +0,0 @@ -// 2007-01-30 Paolo Carlini - -// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free -// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -// USA. - -#include -#include -#include -#include -#include - -// libstdc++/14493 -void test01() -{ - bool test __attribute__((unused)) = true; - using namespace std; - - bad_alloc ba; - VERIFY( !strcmp(ba.what(), "std::bad_alloc") ); - - bad_cast bc; - VERIFY( !strcmp(bc.what(), "std::bad_cast") ); - - bad_typeid bt; - VERIFY( !strcmp(bt.what(), "std::bad_typeid") ); - - exception e; - VERIFY( !strcmp(e.what(), "std::exception") ); - - bad_exception be; - VERIFY( !strcmp(be.what(), "std::bad_exception") ); -} - -int main() -{ - test01(); - return 0; -} diff --git a/libstdc++-v3/testsuite/18_support/bad_alloc/what.cc b/libstdc++-v3/testsuite/18_support/bad_alloc/what.cc new file mode 100644 index 00000000000..3beb3bd1c42 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/bad_alloc/what.cc @@ -0,0 +1,41 @@ +// 2007-01-30 Paolo Carlini + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include +#include + +// libstdc++/14493 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + bad_alloc ba; + VERIFY( !strcmp(ba.what(), "std::bad_alloc") ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/18_support/bad_cast/what.cc b/libstdc++-v3/testsuite/18_support/bad_cast/what.cc new file mode 100644 index 00000000000..e22495f611d --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/bad_cast/what.cc @@ -0,0 +1,41 @@ +// 2007-01-30 Paolo Carlini + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include +#include + +// libstdc++/14493 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + bad_cast bc; + VERIFY( !strcmp(bc.what(), "std::bad_cast") ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c b/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c new file mode 100644 index 00000000000..8c953eaed0e --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c @@ -0,0 +1,63 @@ +// { dg-require-sharedlib "" } +// { dg-options "-g -O2 -pthread -ldl -x c" { target *-*-linux* } } + +// Copyright (C) 2005 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include +#include + +// NB: This must be compiled and linked as a "C" executable. +static void* run(void* arg) +{ + typedef void (*function_type) (void); + void* lib; + void (*cb)(); + + lib = dlopen("./testsuite_shared.so", RTLD_NOW); + if (lib == NULL) + { + printf("dlopen failed: %s\n", strerror(errno)); + return NULL; + } + cb = (function_type) dlsym(lib, "try_throw_exception"); + if (cb == NULL) + { + printf("dlsym failed: %s\n", strerror(errno)); + return NULL; + } + cb(); + dlclose(lib); + return NULL; +} + +// libstdc++/23591 +int main(void) +{ + pthread_t pt; + + if (pthread_create(&pt, NULL, &run, NULL) != 0) + return 1; + if (pthread_join(pt, NULL) != 0) + return 1; + + return 0; +} diff --git a/libstdc++-v3/testsuite/18_support/bad_exception/what.cc b/libstdc++-v3/testsuite/18_support/bad_exception/what.cc new file mode 100644 index 00000000000..a18bafe7787 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/bad_exception/what.cc @@ -0,0 +1,41 @@ +// 2007-01-30 Paolo Carlini + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include +#include + +// libstdc++/14493 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + bad_exception be; + VERIFY( !strcmp(be.what(), "std::bad_exception") ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/18_support/bad_typeid/what.cc b/libstdc++-v3/testsuite/18_support/bad_typeid/what.cc new file mode 100644 index 00000000000..4e8d9a86893 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/bad_typeid/what.cc @@ -0,0 +1,41 @@ +// 2007-01-30 Paolo Carlini + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include +#include + +// libstdc++/14493 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + bad_typeid bt; + VERIFY( !strcmp(bt.what(), "std::bad_typeid") ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/18_support/exception/what.cc b/libstdc++-v3/testsuite/18_support/exception/what.cc new file mode 100644 index 00000000000..d328bb77f18 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/exception/what.cc @@ -0,0 +1,41 @@ +// 2007-01-30 Paolo Carlini + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include +#include + +// libstdc++/14493 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + exception e; + VERIFY( !strcmp(e.what(), "std::exception") ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/18_support/uncaught_exception/14026.cc b/libstdc++-v3/testsuite/18_support/uncaught_exception/14026.cc new file mode 100644 index 00000000000..d6948906d41 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/uncaught_exception/14026.cc @@ -0,0 +1,54 @@ +// Copyright (C) 2004, 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +// PR 14026 +// 18.6.4 uncaught_exception + +#include +#include +#include + +static void +no_uncaught () +{ + if (std::uncaught_exception()) + abort(); +} + +int +main() +{ + try + { + throw 1; + } + catch (...) + { + try + { + throw; + } + catch (...) + { + no_uncaught (); + } + } + no_uncaught(); + + return 0; +} diff --git a/libstdc++-v3/testsuite/19_diagnostics/bad_exception/23591_thread-1.c b/libstdc++-v3/testsuite/19_diagnostics/bad_exception/23591_thread-1.c deleted file mode 100644 index 8c953eaed0e..00000000000 --- a/libstdc++-v3/testsuite/19_diagnostics/bad_exception/23591_thread-1.c +++ /dev/null @@ -1,63 +0,0 @@ -// { dg-require-sharedlib "" } -// { dg-options "-g -O2 -pthread -ldl -x c" { target *-*-linux* } } - -// Copyright (C) 2005 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 2, 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 COPYING. If not, write to the Free -// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -// USA. - -#include -#include -#include -#include -#include - -// NB: This must be compiled and linked as a "C" executable. -static void* run(void* arg) -{ - typedef void (*function_type) (void); - void* lib; - void (*cb)(); - - lib = dlopen("./testsuite_shared.so", RTLD_NOW); - if (lib == NULL) - { - printf("dlopen failed: %s\n", strerror(errno)); - return NULL; - } - cb = (function_type) dlsym(lib, "try_throw_exception"); - if (cb == NULL) - { - printf("dlsym failed: %s\n", strerror(errno)); - return NULL; - } - cb(); - dlclose(lib); - return NULL; -} - -// libstdc++/23591 -int main(void) -{ - pthread_t pt; - - if (pthread_create(&pt, NULL, &run, NULL) != 0) - return 1; - if (pthread_join(pt, NULL) != 0) - return 1; - - return 0; -} diff --git a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-3.cc b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-3.cc new file mode 100644 index 00000000000..4dbad0d2709 --- /dev/null +++ b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-3.cc @@ -0,0 +1,69 @@ +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2007 +// 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include + +// test copy ctors, assignment operators, and persistence of member string data +// libstdc++/1972 +// via Greg Bumgardner +void allocate_on_stack(void) +{ + const size_t num = 512; + __extension__ char array[num]; + for (size_t i = 0; i < num; i++) + array[i]=0; +} + +void test04() +{ + bool test __attribute__((unused)) = true; + const std::string s("CA ISO emergency once again:immediate power down"); + const char* strlit1 = "wish I lived in Palo Alto"; + const char* strlit2 = "...or Santa Barbara"; + std::logic_error obj1(s); + + // block 01 + { + const std::string s2(strlit1); + std::logic_error obj2(s2); + obj1 = obj2; + } + allocate_on_stack(); + VERIFY( std::strcmp(strlit1, obj1.what()) == 0 ); + + // block 02 + { + const std::string s3(strlit2); + std::logic_error obj3 = std::logic_error(s3); + obj1 = obj3; + } + allocate_on_stack(); + VERIFY( std::strcmp(strlit2, obj1.what()) == 0 ); +} + +int main(void) +{ + test04(); + return 0; +} diff --git a/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-big.cc b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-big.cc new file mode 100644 index 00000000000..681e2a364b1 --- /dev/null +++ b/libstdc++-v3/testsuite/19_diagnostics/logic_error/what-big.cc @@ -0,0 +1,41 @@ +// 2007-05-29 Benjamin Kosnik + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include + +// Can construct and return 10k character error string. +void test01() +{ + typedef std::logic_error test_type; + + bool test __attribute__((unused)) = true; + const std::string xxx(10000, 'x'); + test_type t(xxx); + VERIFY( std::strcmp(t.what(), xxx.c_str()) == 0 ); +} + +int main(void) +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc index 04b85c0c5fe..63cb4816322 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-3.cc @@ -26,7 +26,7 @@ #include #include -// test copy ctors and assignment operators +// test copy ctors, assignment operators, and persistence of member string data // libstdc++/1972 // via Greg Bumgardner void allocate_on_stack(void) @@ -36,6 +36,7 @@ void allocate_on_stack(void) for (size_t i = 0; i < num; i++) array[i]=0; } + void test04() { bool test __attribute__((unused)) = true; diff --git a/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-big.cc b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-big.cc new file mode 100644 index 00000000000..c0ce964f6f8 --- /dev/null +++ b/libstdc++-v3/testsuite/19_diagnostics/runtime_error/what-big.cc @@ -0,0 +1,41 @@ +// 2007-05-29 Benjamin Kosnik + +// Copyright (C) 2007 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 2, 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 COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include +#include +#include + +// Can construct and return 10k character error string. +void test01() +{ + typedef std::runtime_error test_type; + + bool test __attribute__((unused)) = true; + const std::string xxx(10000, 'x'); + test_type t(xxx); + VERIFY( std::strcmp(t.what(), xxx.c_str()) == 0 ); +} + +int main(void) +{ + test01(); + return 0; +}