From a7bdc5ad54fbd5d90c8a5164472ccd80a90a1971 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Mon, 22 Feb 2016 17:44:51 +0000 Subject: Don't enable /GX by default The /GX flag is disabled unless explicitly specified on the command line. This partially addresses PR26698. llvm-svn: 261537 --- clang/lib/Driver/Tools.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'clang/lib/Driver/Tools.cpp') diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index fd647a484e6..b04ef6c0309 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -5813,8 +5813,10 @@ static EHFlags parseClangCLEHFlags(const Driver &D, const ArgList &Args) { } } // The /GX, /GX- flags are only processed if there are not /EH flags. + // The default is that /GX is not specified. if (EHArgs.empty() && - Args.hasFlag(options::OPT__SLASH_GX, options::OPT__SLASH_GX_)) { + Args.hasFlag(options::OPT__SLASH_GX, options::OPT__SLASH_GX_, + /*default=*/false)) { EH.Synch = true; EH.NoUnwindC = true; } -- cgit v1.2.3