Revert "Add asm.js-style setjmp/longjmp handling for wasm"

This reverts commit r280302, it broke the integration tests.

llvm-svn: 280329

1 files changed, 1 insertions, 8 deletions

diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
index 66976a77892..3aa25932f84 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
@@ -165,14 +165,7 @@ void WebAssemblyPassConfig::addIRPasses() {
   if (getOptLevel() != CodeGenOpt::None)
     addPass(createWebAssemblyOptimizeReturned());
 
-  // If exception handling is not enabled, we lower invokes into calls and
-  // simplify CFG to delete unreachable landingpad blocks.
-  if (!EnableEmException) {
-    addPass(createLowerInvokePass());
-    addPass(createCFGSimplificationPass());
-  }
-
-  // Handle exceptions and setjmp/longjmp if enabled.
+  // Handle exceptions.
   if (EnableEmException || EnableEmSjLj)
     addPass(createWebAssemblyLowerEmscriptenEHSjLj(EnableEmException,
                                                    EnableEmSjLj));