diff --git a/test/decorators.py b/test/decorators.py index 538ed5f7a7573..85c17ddd896fb 100644 --- a/test/decorators.py +++ b/test/decorators.py @@ -562,6 +562,8 @@ def with_all_eh_sjlj(func): def metafunc(self, mode, *args, **kwargs): if common.EMTEST_VERBOSE: print(f'parameterize:eh_mode={mode}') + if '-flto' in self.cflags or '-flto=thin' in self.cflags: + self.skipTest('LTO EH tests are temporarily disabled until https://github.com/llvm/llvm-project/pull/224313 lands') if mode in {'wasm', 'wasm_legacy'}: if self.is_wasm2js(): self.skipTest('wasm2js does not support wasm EH/SjLj') diff --git a/test/test_core.py b/test/test_core.py index bd34c3c06bc96..a88c5d6448557 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -1167,6 +1167,8 @@ def test_exceptions(self): @requires_wasm_eh def test_exceptions_with_and_without_longjmp(self): + if '-flto' in self.cflags or '-flto=thin' in self.cflags: + self.skipTest('LTO EH tests are temporarily disabled until https://github.com/llvm/llvm-project/pull/224313 lands') self.set_setting('EXCEPTION_DEBUG') self.maybe_closure() # Emscripten EH with and without Emscripten SjLj support diff --git a/test/test_other.py b/test/test_other.py index 5c8eee6d6038c..b755d7b681b5f 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -8882,6 +8882,7 @@ def test_lto_flags(self): # We have LTO tests covered in 'wasmltoN' targets in test_core.py, but they # don't run as a part of Emscripten CI, so we add a separate LTO test here. + @disabled('LTO EH tests are temporarily disabled until https://github.com/llvm/llvm-project/pull/224313 lands') @requires_wasm_eh @parameterized({ '': (['-sWASM_LEGACY_EXCEPTIONS=0'],), diff --git a/tools/building.py b/tools/building.py index 4a4a466ac8915..da4a041902205 100644 --- a/tools/building.py +++ b/tools/building.py @@ -332,8 +332,6 @@ def lld_flags(args): for a in llvm_backend_args(): args += ['-mllvm', a] - if settings.WASM_EXCEPTIONS: - args += ['-mllvm', '-wasm-enable-eh'] if settings.WASM_EXCEPTIONS or settings.SUPPORT_LONGJMP == 'wasm': args += ['-mllvm', '-exception-model=wasm'] elif not settings.DISABLE_EXCEPTION_CATCHING: