From 0876bdf57b6d7a6920723e41952ea1ab7f2503dc Mon Sep 17 00:00:00 2001 From: Tony Wang Date: Wed, 10 Sep 2014 04:45:32 +0000 Subject: [PATCH] re PR libgcc/56846 (_Unwind_Backtrace on ARM and noexcept) 2014-09-10 Tony Wang libstdc++-v3/ PR target/56846 * libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): Return with CONTINUE_UNWINDING when the state pattern contains: _US_VIRTUAL_UNWIND_FRAME | _US_FORCE_UNWIND From-SVN: r215101 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/libsupc++/eh_personality.cc | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a5acf92b2dc..e00adb5c86d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2014-09-10 Tony Wang + + PR target/56846 + * libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): + Return with CONTINUE_UNWINDING when the state pattern + contains: _US_VIRTUAL_UNWIND_FRAME | _US_FORCE_UNWIND + 2014-09-09 Jonathan Wakely * include/bits/deque.tcc (deque::operator=(const deque&)): Handle diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc index f315a8341b8..cb4467aa032 100644 --- a/libstdc++-v3/libsupc++/eh_personality.cc +++ b/libstdc++-v3/libsupc++/eh_personality.cc @@ -378,6 +378,12 @@ PERSONALITY_FUNCTION (int version, switch (state & _US_ACTION_MASK) { case _US_VIRTUAL_UNWIND_FRAME: + // If the unwind state pattern is + // _US_VIRTUAL_UNWIND_FRAME | _US_FORCE_UNWIND + // then we don't need to search for any handler as it is not a real + // exception. Just unwind the stack. + if (state & _US_FORCE_UNWIND) + CONTINUE_UNWINDING; actions = _UA_SEARCH_PHASE; break; -- 2.30.2