diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-01-27 20:38:30 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-01-27 20:38:30 +0000 |
| commit | c44c8d4225955d2334037751008b83e12f24dae4 (patch) | |
| tree | 261ac5ef5b8a8c614d93c5f2f6e8d79a95ed6866 /libcxxabi | |
| parent | 5f2bcf5c985798e95da9696f402e444347d6e8df (diff) | |
| download | llvm-c44c8d4225955d2334037751008b83e12f24dae4.zip llvm-c44c8d4225955d2334037751008b83e12f24dae4.tar.gz llvm-c44c8d4225955d2334037751008b83e12f24dae4.tar.bz2 | |
Merging r226820:
------------------------------------------------------------------------
r226820 | logan | 2015-01-22 05:28:39 -0800 (Thu, 22 Jan 2015) | 5 lines
Fix _Unwind_Backtrace for libc++abi built with libgcc.
Implement an undocumented _US_FORCE_UNWIND flag for force
unwinding.
------------------------------------------------------------------------
llvm-svn: 227236
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/include/unwind.h | 2 | ||||
| -rw-r--r-- | libcxxabi/src/cxa_personality.cpp | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libcxxabi/include/unwind.h b/libcxxabi/include/unwind.h index ad91d25..edf5fdd 100644 --- a/libcxxabi/include/unwind.h +++ b/libcxxabi/include/unwind.h @@ -63,6 +63,8 @@ typedef uint32_t _Unwind_State; static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME = 0; static const _Unwind_State _US_UNWIND_FRAME_STARTING = 1; static const _Unwind_State _US_UNWIND_FRAME_RESUME = 2; +/* Undocumented flag for force unwinding. */ +static const _Unwind_State _US_FORCE_UNWIND = 8; typedef uint32_t _Unwind_EHT_Header; diff --git a/libcxxabi/src/cxa_personality.cpp b/libcxxabi/src/cxa_personality.cpp index a67fb5c..3385ea3 100644 --- a/libcxxabi/src/cxa_personality.cpp +++ b/libcxxabi/src/cxa_personality.cpp @@ -1101,9 +1101,16 @@ __gxx_personality_v0(_Unwind_State state, _Unwind_SetGR(context, REG_UCB, reinterpret_cast<uint32_t>(unwind_exception)); #endif + // Check the undocumented force unwinding behavior + bool is_force_unwinding = state & _US_FORCE_UNWIND; + state &= ~_US_FORCE_UNWIND; + scan_results results; switch (state) { case _US_VIRTUAL_UNWIND_FRAME: + if (is_force_unwinding) + return continue_unwind(unwind_exception, context); + // Phase 1 search: All we're looking for in phase 1 is a handler that halts unwinding scan_eh_tab(results, _UA_SEARCH_PHASE, native_exception, unwind_exception, context); if (results.reason == _URC_HANDLER_FOUND) @@ -1119,6 +1126,11 @@ __gxx_personality_v0(_Unwind_State state, return results.reason; case _US_UNWIND_FRAME_STARTING: + // TODO: Support force unwinding in the phase 2 search. + // NOTE: In order to call the cleanup functions, _Unwind_ForcedUnwind() + // will call this personality function with (_US_FORCE_UNWIND | + // _US_UNWIND_FRAME_STARTING). + // Phase 2 search if (unwind_exception->barrier_cache.sp == _Unwind_GetGR(context, REG_SP)) { |