Commit d8a6deab authored by Reid Kleckner's avatar Reid Kleckner Committed by Hans Wennborg
Browse files

Fix MSVC build with C++ EH enabled 

Mark the CrashRecoveryContextImpl constructor noexcept, so that MSVC
won't emit an unwind helper to clean up the allocation from `new` if the
constructor throws an exception.

Otherwise, MSVC complains:
  llvm\lib\Support\CrashRecoveryContext.cpp(220): error C2712: \
  Cannot use __try in functions that require object unwinding

The other simple fix would be to wrap `new` in a static helper or
lambda.

Users have reported that Tensorflow builds LLVM with /EHsc.

(cherry picked from commit a349c091)
parent 3c94b278

llvm/lib/Support/CrashRecoveryContext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct CrashRecoveryContextImpl { 
  unsigned ValidJumpBuffer : 1;



public:

  CrashRecoveryContextImpl(CrashRecoveryContext *CRC)

  CrashRecoveryContextImpl(CrashRecoveryContext *CRC) noexcept

      : CRC(CRC), Failed(false), SwitchedThread(false), ValidJumpBuffer(false) {

    Next = CurrentContext->get();

    CurrentContext->set(this);