aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2014-04-21 17:19:53 -0700
committerAndrew Hsieh <andrewhsieh@google.com>2014-04-21 17:22:50 -0700
commitaf62f7eeca255ab8e646f9903809f39f0881a6f2 (patch)
tree88ae81eb812c2b5ea36a70618ed9b2de4dbb01dd /gcc-4.6
parentf33c7b3122b1d7950efa88067c9a156229ba647b (diff)
downloadtoolchain_gcc-af62f7eeca255ab8e646f9903809f39f0881a6f2.zip
toolchain_gcc-af62f7eeca255ab8e646f9903809f39f0881a6f2.tar.gz
toolchain_gcc-af62f7eeca255ab8e646f9903809f39f0881a6f2.tar.bz2
[4.6, 4.8] Backport fix PR libstdc++/59392: Fix ARM EABI uncaught throw from unexpected exception handler
http://gcc.gnu.org/viewcvs/gcc?view=revision&revision=208519 2014-03-12 Roland McGrath <mcgrathr@google.com> Mark Seaborn <mseaborn@google.com> libstdc++-v3/ PR libstdc++/59392 * libsupc++/eh_call.cc (__cxa_call_unexpected): Call __do_catch with the address of a null pointer, not with a null pointer to pointer. Copy comment for this case from eh_personality.cc:__cxa_call_unexpected. * testsuite/18_support/bad_exception/59392.cc: New file. Change-Id: I14e060bccb72881ba8d7e24022d429cd304e2ae3
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/libstdc++-v3/libsupc++/eh_call.cc16
-rw-r--r--gcc-4.6/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc51
2 files changed, 61 insertions, 6 deletions
diff --git a/gcc-4.6/libstdc++-v3/libsupc++/eh_call.cc b/gcc-4.6/libstdc++-v3/libsupc++/eh_call.cc
index f519f35..f8f403f 100644
--- a/gcc-4.6/libstdc++-v3/libsupc++/eh_call.cc
+++ b/gcc-4.6/libstdc++-v3/libsupc++/eh_call.cc
@@ -105,14 +105,14 @@ __cxa_call_unexpected(void* exc_obj_in)
} end_catch_protect_obj;
- __try
- {
+ __try
+ {
if (foreign_exception)
std::unexpected();
else
__unexpected(unexpectedHandler);
}
- __catch(...)
+ __catch(...)
{
/* See if the new exception matches the rtti list. */
if (foreign_exception)
@@ -141,15 +141,19 @@ __cxa_call_unexpected(void* exc_obj_in)
&new_ptr) != ctm_failed)
__throw_exception_again;
- if (catch_type->__do_catch(&bad_exc, 0, 1))
+ // If the exception spec allows std::bad_exception, throw that.
+ // We don't have a thrown object to compare against, but since
+ // bad_exception doesn't have virtual bases, that's OK; just pass NULL.
+ void* obj = NULL;
+ if (catch_type->__do_catch(&bad_exc, &obj, 1))
bad_exception_allowed = true;
}
// If the exception spec allows std::bad_exception, throw that.
-#ifdef __EXCEPTIONS
+#ifdef __EXCEPTIONS
if (bad_exception_allowed)
throw std::bad_exception();
-#endif
+#endif
// Otherwise, die.
__terminate(terminateHandler);
diff --git a/gcc-4.6/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc b/gcc-4.6/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
new file mode 100644
index 0000000..c9b65a2
--- /dev/null
+++ b/gcc-4.6/libstdc++-v3/testsuite/18_support/bad_exception/59392.cc
@@ -0,0 +1,51 @@
+// Copyright (C) 2014 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/>.
+
+#include <exception>
+#include <cstdlib>
+
+class expected {};
+class unexpected {};
+class from_handler {};
+
+static void func_with_exception_spec() throw(expected)
+{
+ throw unexpected();
+}
+
+static void unexpected_handler()
+{
+ throw from_handler();
+}
+
+static void terminate_handler()
+{
+ exit(0);
+}
+
+// libstdc++/59392
+int main()
+{
+ std::set_unexpected(unexpected_handler);
+ std::set_terminate(terminate_handler);
+ try {
+ func_with_exception_spec();
+ } catch (expected&) {
+ abort();
+ }
+ abort();
+}