diff options
| author | Reid Kleckner <reid@kleckner.net> | 2015-02-05 18:56:03 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2015-02-05 18:56:03 +0000 |
| commit | deeddeced312a21b8454336cfab9fe2b58863cf8 (patch) | |
| tree | 87170d3e4cedf4bc76f9916cbdd5d74f33e676e1 /clang/lib/Driver/Tools.cpp | |
| parent | c9dd02066cc0528da28bd887e8dbdb3bd9c68165 (diff) | |
| download | llvm-deeddeced312a21b8454336cfab9fe2b58863cf8.zip llvm-deeddeced312a21b8454336cfab9fe2b58863cf8.tar.gz llvm-deeddeced312a21b8454336cfab9fe2b58863cf8.tar.bz2 | |
Re-land r228258 and make clang-cl's /EHs- disable -fexceptions again
After r228258, Clang started emitting C++ EH IR that LLVM wasn't ready
to deal with, even when exceptions were disabled with /EHs-. This time,
make /EHs- turn off -fexceptions while still emitting exceptional
constructs in functions using __try. Since Sema rejects C++ exception
handling constructs before CodeGen, landingpads should only appear in
such functions as the result of a __try.
llvm-svn: 228329
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index d24375b..8634ed6 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -4877,10 +4877,10 @@ void Clang::AddClangCLArgs(const ArgList &Args, ArgStringList &CmdArgs) const { const Driver &D = getToolChain().getDriver(); EHFlags EH = parseClangCLEHFlags(D, Args); // FIXME: Do something with NoExceptC. - if (EH.Synch || EH.Asynch) + if (EH.Synch || EH.Asynch) { CmdArgs.push_back("-fcxx-exceptions"); - // Always add -fexceptions to allow SEH __try. - CmdArgs.push_back("-fexceptions"); + CmdArgs.push_back("-fexceptions"); + } // /EP should expand to -E -P. if (Args.hasArg(options::OPT__SLASH_EP)) { |