diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-08 01:17:50 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-08 01:17:50 +0000 |
| commit | 3e254a6ece452fcaee6da4a7286245d0a9ef7c45 (patch) | |
| tree | 41134395324ddff7bbf652472f84ce6ddb4fc5ce /libcxx/src/exception.cpp | |
| parent | 90a8fc8cb837083fe379a4188bd9775c90af93b8 (diff) | |
| download | bcm5719-llvm-3e254a6ece452fcaee6da4a7286245d0a9ef7c45.tar.gz bcm5719-llvm-3e254a6ece452fcaee6da4a7286245d0a9ef7c45.zip | |
[libc++] Implement exception_ptr on Windows
Summary:
This patch implements exception_ptr on Windows using the `__ExceptionPtrFoo` functions provided by MSVC.
The `__ExceptionPtrFoo` functions are defined inside the C++ standard library, `msvcprt`, which is unfortunate because it requires libc++ to link to the MSVC STL. However this doesn't seem to cause any immediate problems. However to be safe I kept all usages within the libc++ dylib so that user programs wouldn't have to link to MSVCPRT as well.
Note there are still 2 outstanding exception_ptr/nested_exception test failures.
* `current_exception.pass.cpp` needs to be rewritten for the Windows exception_ptr semantics which copy the exception every time.
* `rethrow_if_nested.pass.cpp` need investigation. It hits a stack overflow, likely from recursion.
This patch also gets most of the `<future>` tests passing as well.
Reviewers: mclow.lists, compnerd, bcraig, rmaprath, majnemer, BillyONeal, STL_MSFT
Subscribers: mgorny, cfe-commits
Differential Revision: https://reviews.llvm.org/D32927
llvm-svn: 302393
Diffstat (limited to 'libcxx/src/exception.cpp')
| -rw-r--r-- | libcxx/src/exception.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index 0b502cd134c..4359d126173 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/src/exception.cpp @@ -20,7 +20,7 @@ #if defined(_LIBCPP_ABI_MICROSOFT) #include "support/runtime/exception_msvc.ipp" -#include "support/runtime/exception_pointer_unimplemented.ipp" +#include "support/runtime/exception_pointer_msvc.ipp" #elif defined(_LIBCPPABI_VERSION) #include "support/runtime/exception_libcxxabi.ipp" #include "support/runtime/exception_pointer_cxxabi.ipp" |
