diff options
| author | David Chisnall <dchisnall@pathscale.com> | 2014-05-09 01:35:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 01:35:32 +0000 |
| commit | 7b2f8b5d8844d99784cc4f638435889a871dc3da (patch) | |
| tree | fca62f1044aa9df99b6948b7ed2ba39f30482455 | |
| parent | 2e54c354784a45b12ca666c49d1821f55e0919d8 (diff) | |
| parent | 95a7dd692615a55e9105c7486c589a7046cbb05d (diff) | |
| download | libcxxrt-7b2f8b5d8844d99784cc4f638435889a871dc3da.tar.gz | |
am 95a7dd69: Don\'t call the _fast version of the TLS accessor in terminate() or unexpected().
* commit '95a7dd692615a55e9105c7486c589a7046cbb05d':
Don't call the _fast version of the TLS accessor in terminate() or unexpected().
| -rw-r--r-- | src/exception.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/exception.cc b/src/exception.cc index 7f0d3e8..50ee582 100644 --- a/src/exception.cc +++ b/src/exception.cc @@ -1404,7 +1404,7 @@ namespace std */ void terminate() { - static __cxa_thread_info *info = thread_info_fast(); + static __cxa_thread_info *info = thread_info(); if (0 != info && 0 != info->terminateHandler) { info->terminateHandler(); @@ -1421,7 +1421,7 @@ namespace std */ void unexpected() { - static __cxa_thread_info *info = thread_info_fast(); + static __cxa_thread_info *info = thread_info(); if (0 != info && 0 != info->unexpectedHandler) { info->unexpectedHandler(); |