diff options
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Driver/cl-eh.cpp | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 91cf841..84c3228 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -4820,10 +4820,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) { - CmdArgs.push_back("-fexceptions"); + if (EH.Synch || EH.Asynch) CmdArgs.push_back("-fcxx-exceptions"); - } + // Always add -fexceptions to allow SEH __try. + CmdArgs.push_back("-fexceptions"); // /EP should expand to -E -P. if (Args.hasArg(options::OPT__SLASH_EP)) { diff --git a/clang/test/Driver/cl-eh.cpp b/clang/test/Driver/cl-eh.cpp index 8a3450a..c9cb903 100644 --- a/clang/test/Driver/cl-eh.cpp +++ b/clang/test/Driver/cl-eh.cpp @@ -5,18 +5,23 @@ // command-line option, e.g. on Mac where %s is commonly under /Users. // RUN: %clang_cl /c /EHsc -### -- %s 2>&1 | FileCheck -check-prefix=EHsc %s +// EHsc: "-fcxx-exceptions" // EHsc: "-fexceptions" // RUN: %clang_cl /c /EHs-c- -### -- %s 2>&1 | FileCheck -check-prefix=EHs_c_ %s -// EHs_c_-NOT: "-fexceptions" +// EHs_c_-NOT: "-fcxx-exceptions" +// EHs_c_: "-fexceptions" // RUN: %clang_cl /c /EHs- /EHc- -### -- %s 2>&1 | FileCheck -check-prefix=EHs_EHc_ %s -// EHs_EHc_-NOT: "-fexceptions" +// EHs_EHc_-NOT: "-fcxx-exceptions" +// EHs_EHc_: "-fexceptions" // RUN: %clang_cl /c /EHs- /EHs -### -- %s 2>&1 | FileCheck -check-prefix=EHs_EHs %s +// EHs_EHs: "-fcxx-exceptions" // EHs_EHs: "-fexceptions" // RUN: %clang_cl /c /EHs- /EHsa -### -- %s 2>&1 | FileCheck -check-prefix=EHs_EHa %s +// EHs_EHa: "-fcxx-exceptions" // EHs_EHa: "-fexceptions" // RUN: %clang_cl /c /EHinvalid -### -- %s 2>&1 | FileCheck -check-prefix=EHinvalid %s |