remove -mllvm -experimental-wasm-enable-alt-sjlj

Author: yamt

clang/lib/Driver/ToolChains/WebAssembly.cpp

@@ -386,20 +386,6 @@ void WebAssembly::addClangTargetOptions(const ArgList &DriverArgs,
       // Backend needs '-exception-model=wasm' to use Wasm EH instructions
       CC1Args.push_back("-exception-model=wasm");
     }
-
-    if (Opt.starts_with("-experimental-wasm-enable-alt-sjlj")) {
-      // '-mllvm -experimental-wasm-enable-alt-sjlj' should be used with
-      // '-mllvm -wasm-enable-sjlj'
-      bool HasWasmEnableSjlj = false;
-      for (const Arg *A : DriverArgs.filtered(options::OPT_mllvm)) {
-        if (StringRef(A->getValue(0)) == "-wasm-enable-sjlj")
-          HasWasmEnableSjlj = true;
-      }
-      if (!HasWasmEnableSjlj)
-        getDriver().Diag(diag::err_drv_argument_only_allowed_with)
-            << "-mllvm -experimental-wasm-enable-alt-sjlj"
-            << "-mllvm -wasm-enable-sjlj";
-    }
   }
 }
 

llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.cpp

@@ -54,9 +54,6 @@ cl::opt<bool>
 // setjmp/longjmp handling using wasm EH instrutions
 cl::opt<bool> WebAssembly::WasmEnableSjLj(
     "wasm-enable-sjlj", cl::desc("WebAssembly setjmp/longjmp handling"));
-cl::opt<bool> WebAssembly::WasmEnableAltSjLj(
-    "experimental-wasm-enable-alt-sjlj",
-    cl::desc("Use experimental alternate ABI for -wasm-enable-sjlj"));
 
 static MCAsmInfo *createMCAsmInfo(const MCRegisterInfo & /*MRI*/,
                                   const Triple &TT,

llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCTargetDesc.h

@@ -44,7 +44,6 @@ extern cl::opt<bool> WasmEnableEmEH;   // asm.js-style EH
 extern cl::opt<bool> WasmEnableEmSjLj; // asm.js-style SjLJ
 extern cl::opt<bool> WasmEnableEH;     // EH using Wasm EH instructions
 extern cl::opt<bool> WasmEnableSjLj;   // SjLj using Wasm EH instructions
-extern cl::opt<bool> WasmEnableAltSjLj; // Alt ABI for WasmEnableSjLj
 
 enum OperandType {
   /// Basic block label in a branch construct.

llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp

@@ -370,7 +370,6 @@ FunctionPass *WebAssemblyPassConfig::createTargetRegisterAllocator(bool) {
   return nullptr; // No reg alloc
 }
 
-using WebAssembly::WasmEnableAltSjLj;
 using WebAssembly::WasmEnableEH;
 using WebAssembly::WasmEnableEmEH;
 using WebAssembly::WasmEnableEmSjLj;
@@ -406,9 +405,6 @@ static void basicCheckForEHAndSjLj(TargetMachine *TM) {
     report_fatal_error(
         "-exception-model=wasm only allowed with at least one of "
         "-wasm-enable-eh or -wasm-enable-sjlj");
-  if (!WasmEnableSjLj && WasmEnableAltSjLj)
-    report_fatal_error("-experimental-wasm-enable-alt-sjlj only allowed with "
-                       "-wasm-enable-sjlj");
 
   // You can't enable two modes of EH at the same time
   if (WasmEnableEmEH && WasmEnableEH)