Author: Jan Svoboda Date: 2020-12-15T10:15:58+01:00 New Revision: 573255b47eb9b210e74a1c620fee363dfaa52794
URL: https://github.com/llvm/llvm-project/commit/573255b47eb9b210e74a1c620fee363dfaa52794 DIFF: https://github.com/llvm/llvm-project/commit/573255b47eb9b210e74a1c620fee363dfaa52794.diff LOG: [clang][cli] Squash exception model in LangOptions into one member This squashes multiple members in LangOptions into one. This is leveraged in a follow-up patch that implements marshalling of related command-line options. Depends on D93214. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D93215 Added: Modified: clang/include/clang/Basic/LangOptions.def clang/include/clang/Basic/LangOptions.h clang/lib/Frontend/CompilerInvocation.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def index 19fb4ae82b89..251fd68f4df8 100644 --- a/clang/include/clang/Basic/LangOptions.def +++ b/clang/include/clang/Basic/LangOptions.def @@ -129,10 +129,8 @@ LANGOPT(ZVector , 1, 0, "System z vector extensions") LANGOPT(Exceptions , 1, 0, "exception handling") LANGOPT(ObjCExceptions , 1, 0, "Objective-C exceptions") LANGOPT(CXXExceptions , 1, 0, "C++ exceptions") -LANGOPT(DWARFExceptions , 1, 0, "dwarf exception handling") -LANGOPT(SjLjExceptions , 1, 0, "setjmp-longjump exception handling") -LANGOPT(SEHExceptions , 1, 0, "SEH .xdata exception handling") -LANGOPT(WasmExceptions , 1, 0, "WebAssembly exception handling") +ENUM_LANGOPT(ExceptionHandling, ExceptionHandlingKind, 3, + ExceptionHandlingKind::None, "exception handling") LANGOPT(IgnoreExceptions , 1, 0, "ignore exceptions") LANGOPT(ExternCNoUnwind , 1, 0, "Assume extern C functions don't unwind") LANGOPT(TraditionalCPP , 1, 0, "traditional CPP emulation") diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h index d4791650ec6b..2780e4bf35fd 100644 --- a/clang/include/clang/Basic/LangOptions.h +++ b/clang/include/clang/Basic/LangOptions.h @@ -22,6 +22,7 @@ #include "llvm/ADT/FloatingPointMode.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Triple.h" +#include "llvm/MC/MCTargetOptions.h" #include <string> #include <vector> @@ -209,6 +210,9 @@ class LangOptions : public LangOptionsBase { FPE_Strict }; + /// Possible exception handling behavior. + using ExceptionHandlingKind = llvm::ExceptionHandling; + enum class LaxVectorConversionKind { /// Permit no implicit vector bitcasts. None, @@ -381,10 +385,21 @@ class LangOptions : public LangOptionsBase { return getSignReturnAddressScope() == SignReturnAddressScopeKind::All; } - bool hasSjLjExceptions() const { return SjLjExceptions; } - bool hasSEHExceptions() const { return SEHExceptions; } - bool hasDWARFExceptions() const { return DWARFExceptions; } - bool hasWasmExceptions() const { return WasmExceptions; } + bool hasSjLjExceptions() const { + return getExceptionHandling() == llvm::ExceptionHandling::SjLj; + } + + bool hasSEHExceptions() const { + return getExceptionHandling() == llvm::ExceptionHandling::WinEH; + } + + bool hasDWARFExceptions() const { + return getExceptionHandling() == llvm::ExceptionHandling::DwarfCFI; + } + + bool hasWasmExceptions() const { + return getExceptionHandling() == llvm::ExceptionHandling::Wasm; + } }; /// Floating point control options diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index c1d5364d72ea..e4058cfc1915 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -2981,10 +2981,14 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, Diags.Report(diag::err_fe_invalid_exception_model) << Opt.getName() << T.str(); - Opts.SjLjExceptions = Opt.matches(options::OPT_fsjlj_exceptions); - Opts.SEHExceptions = Opt.matches(options::OPT_fseh_exceptions); - Opts.DWARFExceptions = Opt.matches(options::OPT_fdwarf_exceptions); - Opts.WasmExceptions = Opt.matches(options::OPT_fwasm_exceptions); + if (Opt.matches(options::OPT_fsjlj_exceptions)) + Opts.setExceptionHandling(llvm::ExceptionHandling::SjLj); + else if (Opt.matches(options::OPT_fseh_exceptions)) + Opts.setExceptionHandling(llvm::ExceptionHandling::WinEH); + else if (Opt.matches(options::OPT_fdwarf_exceptions)) + Opts.setExceptionHandling(llvm::ExceptionHandling::DwarfCFI); + else if (Opt.matches(options::OPT_fwasm_exceptions)) + Opts.setExceptionHandling(llvm::ExceptionHandling::Wasm); } Opts.ExternCNoUnwind = Args.hasArg(OPT_fexternc_nounwind); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
