diff options
| -rw-r--r-- | clang/docs/MSVCCompatibility.rst | 17 | ||||
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/clang/docs/MSVCCompatibility.rst b/clang/docs/MSVCCompatibility.rst index 3794813db81..ead0ae847a2 100644 --- a/clang/docs/MSVCCompatibility.rst +++ b/clang/docs/MSVCCompatibility.rst @@ -84,18 +84,23 @@ The status of major ABI-impacting C++ features: * RTTI: :good:`Complete`. Generation of RTTI data structures has been finished, along with support for the ``/GR`` flag. -* Exceptions and SEH: :partial:`Partial`. - C++ exceptions (``try`` / ``catch`` / ``throw``) and - structured exceptions (``__try`` / ``__except`` / ``__finally``) mostly - work on x64. 32-bit exception handling support is being worked on. LLVM does - not model asynchronous exceptions, so it is currently impossible to catch an - asynchronous exception generated in the same frame as the catching ``__try``. +* C++ Exceptions: :good:`Mostly complete`. Support for + C++ exceptions (``try`` / ``catch`` / ``throw``) have been implemented for + x86 and x64. Our implementation has been well tested but we still get the + odd bug report now and again. C++ exception specifications are ignored, but this is `consistent with Visual C++`_. .. _consistent with Visual C++: https://msdn.microsoft.com/en-us/library/wfa0edys.aspx +* Asynchronous Exceptions (SEH): :partial:`Partial`. + Structured exceptions (``__try`` / ``__except`` / ``__finally``) mostly + work on x86 and x64. + LLVM does not model asynchronous exceptions, so it is currently impossible to + catch an asynchronous exception generated in the same frame as the catching + ``__try``. + * Thread-safe initialization of local statics: :good:`Complete`. MSVC 2015 added support for thread-safe initialization of such variables by taking an ABI break. diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 159936760a8..8441a91a637 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2410,11 +2410,9 @@ static void addExceptionArgs(const ArgList &Args, types::ID InputType, } if (types::isCXX(InputType)) { - // Disable C++ EH by default on XCore, PS4, and MSVC. - // FIXME: Remove MSVC from this list once things work. - bool CXXExceptionsEnabled = Triple.getArch() != llvm::Triple::xcore && - !Triple.isPS4CPU() && - !Triple.isWindowsMSVCEnvironment(); + // Disable C++ EH by default on XCore and PS4. + bool CXXExceptionsEnabled = + Triple.getArch() != llvm::Triple::xcore && !Triple.isPS4CPU(); Arg *ExceptionArg = Args.getLastArg( options::OPT_fcxx_exceptions, options::OPT_fno_cxx_exceptions, options::OPT_fexceptions, options::OPT_fno_exceptions); |
