support building projects with both setjmp and c++ exceptions, by avoiding modifying setjmp|longjmp in the exceptions lowering code

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/Transforms/NaCl/PNaClABISimplify.cpp b/lib/Transforms/NaCl/PNaClABISimplify.cpp
index f73d6c1784..6a0aeae700 100644
--- a/lib/Transforms/NaCl/PNaClABISimplify.cpp
+++ b/lib/Transforms/NaCl/PNaClABISimplify.cpp
@@ -47,10 +47,10 @@ void llvm::PNaClABISimplifyAddPreOptPasses(PassManager &PM) {
     PM.add(createLowerInvokePass());
     // Remove landingpad blocks made unreachable by LowerInvoke.
     PM.add(createCFGSimplificationPass());
-
-    PM.add(createLowerEmSetjmpPass()); // XXX EMSCRIPTEN . Note, only if no exceptions
   }
 
+  PM.add(createLowerEmSetjmpPass()); // XXX EMSCRIPTEN . Note, only if no exceptions
+
 #if 0 // EMSCRIPTEN: we allow arbitrary symbols to be preserved
   // Internalize all symbols in the module except _start, which is the only
   // symbol a stable PNaCl pexe is allowed to export.