From 15cf6cba4b8f26da93a1ca4f1454db81641af272 Mon Sep 17 00:00:00 2001
From: Heejin Ahn <aheejin@gmail.com>
Date: Fri, 2 Mar 2018 00:39:16 +0000
Subject: [PATCH] [WebAssembly] Add exception handling option
Summary: Add exception handling option to clang.
Reviewers: dschuff
Subscribers: jfb, sbc100, jgravelle-google, sunfish, cfe-commits
Differential Revision: https://reviews.llvm.org/D43681
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@326517 91177308-0d34-0410-b5e6-96231b3b80d8
---
docs/ClangCommandLineReference.rst | 2 ++
include/clang/Driver/Options.td | 2 ++
lib/Basic/Targets/WebAssembly.cpp | 9 +++++++++
lib/Basic/Targets/WebAssembly.h | 3 ++-
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/docs/ClangCommandLineReference.rst b/docs/ClangCommandLineReference.rst
index 595909eef0..0026f1fbd0 100644
--- a/docs/ClangCommandLineReference.rst
+++ b/docs/ClangCommandLineReference.rst
@@ -2352,6 +2352,8 @@ WebAssembly
.. option:: -msimd128, -mno-simd128
+.. option:: -mexception-handling, -mno-exception-handling
+
X86
---
.. option:: -m3dnow, -mno-3dnow
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index af69c018fb..6824858b99 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -1917,6 +1917,8 @@ def mnontrapping_fptoint : Flag<["-"], "mnontrapping-fptoint">, Group<m_wasm_Fea
def mno_nontrapping_fptoint : Flag<["-"], "mno-nontrapping-fptoint">, Group<m_wasm_Features_Group>;
def msign_ext : Flag<["-"], "msign-ext">, Group<m_wasm_Features_Group>;
def mno_sign_ext : Flag<["-"], "mno-sign-ext">, Group<m_wasm_Features_Group>;
+def mexception_handing : Flag<["-"], "mexception-handling">, Group<m_wasm_Features_Group>;
+def mno_exception_handing : Flag<["-"], "mno-exception-handling">, Group<m_wasm_Features_Group>;
def mamdgpu_debugger_abi : Joined<["-"], "mamdgpu-debugger-abi=">,
Flags<[HelpHidden]>,
diff --git a/lib/Basic/Targets/WebAssembly.cpp b/lib/Basic/Targets/WebAssembly.cpp
index 4338d03ade..b8a2a092af 100644
--- a/lib/Basic/Targets/WebAssembly.cpp
+++ b/lib/Basic/Targets/WebAssembly.cpp
@@ -37,6 +37,7 @@ bool WebAssemblyTargetInfo::hasFeature(StringRef Feature) const {
.Case("simd128", SIMDLevel >= SIMD128)
.Case("nontrapping-fptoint", HasNontrappingFPToInt)
.Case("sign-ext", HasSignExt)
+ .Case("exception-handling", HasExceptionHandling)
.Default(false);
}
@@ -83,6 +84,14 @@ bool WebAssemblyTargetInfo::handleTargetFeatures(
HasSignExt = false;
continue;
}
+ if (Feature == "+exception-handling") {
+ HasExceptionHandling = true;
+ continue;
+ }
+ if (Feature == "-exception-handling") {
+ HasExceptionHandling = false;
+ continue;
+ }
Diags.Report(diag::err_opt_not_valid_with_opt)
<< Feature << "-target-feature";
diff --git a/lib/Basic/Targets/WebAssembly.h b/lib/Basic/Targets/WebAssembly.h
index 305463cd3c..b0e466b8d8 100644
--- a/lib/Basic/Targets/WebAssembly.h
+++ b/lib/Basic/Targets/WebAssembly.h
@@ -32,11 +32,12 @@ class LLVM_LIBRARY_VISIBILITY WebAssemblyTargetInfo : public TargetInfo {
bool HasNontrappingFPToInt;
bool HasSignExt;
+ bool HasExceptionHandling;
public:
explicit WebAssemblyTargetInfo(const llvm::Triple &T, const TargetOptions &)
: TargetInfo(T), SIMDLevel(NoSIMD), HasNontrappingFPToInt(false),
- HasSignExt(false) {
+ HasSignExt(false), HasExceptionHandling(false) {
NoAsmVariants = true;
SuitableAlign = 128;
LargeArrayMinWidth = 128;
--
2.40.0