diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
| commit | 27067774dce3388702a4cf744d7096c6fb71b688 (patch) | |
| tree | 56300949abd050b3cd2e23d29210d2a567bc8aec /contrib/llvm | |
| parent | 44be0a8ea517cbe7a9140bca20e1e93228ac0a04 (diff) | |
| parent | 915a263ea24ab051bb57674a4d6f5ffe4ef0d5b5 (diff) | |
Merge ^/head r303250 through r304235.
Notes
Notes:
svn path=/projects/clang390-import/; revision=304236
Diffstat (limited to 'contrib/llvm')
| -rw-r--r-- | contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp b/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp index 5950c6902e38..ca7b43e113a7 100644 --- a/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp +++ b/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp @@ -572,7 +572,7 @@ static _Unwind_Reason_Code unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor unw_get_reg(cursor, UNW_REG_SP, &sp); if (unw_get_proc_info(cursor, &frameInfo) != UNW_ESUCCESS) { _LIBUNWIND_TRACE_UNWINDING("unwind_phase2(ex_ojb=%p): unw_get_proc_info " - "failed => _URC_FATAL_PHASE1_ERROR\n", + "failed => _URC_FATAL_PHASE2_ERROR\n", static_cast<void *>(exception_object)); return _URC_FATAL_PHASE2_ERROR; } |