From b114f77d8a633341b617a5cadd04e5977beae65d Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 8 Jan 2019 15:57:53 +0100 Subject: [PATCH] Clang: Stop enabling exceptions explicitly According to commit e2e3be09e36f89f4db92c443ec9f7fb1dab70624 this was needed for clang 3.8.0 on Windows. Change-Id: I4f2c2bf31449d9613607e57524c7ff6e4577812a Reviewed-by: Ivan Donchevskii --- .../cpptools/compileroptionsbuilder.cpp | 8 ------- src/plugins/cpptools/compileroptionsbuilder.h | 1 - .../unittest/compileroptionsbuilder-test.cpp | 21 ++----------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index b35645f9c5a..1914ce71978 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -112,7 +112,6 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind, updateLanguageOption(fileKind); addOptionsForLanguage(/*checkForBorlandExtensions*/ true); - enableExceptions(); addToolchainAndProjectMacros(); undefineClangVersionMacrosForMsvc(); @@ -215,13 +214,6 @@ void CompilerOptionsBuilder::addExtraCodeModelFlags() m_options.append(m_projectPart.extraCodeModelFlags); } -void CompilerOptionsBuilder::enableExceptions() -{ - if (m_projectPart.languageVersion > ProjectExplorer::LanguageVersion::LatestC) - add("-fcxx-exceptions"); - add("-fexceptions"); -} - static QString creatorResourcePath() { #ifndef UNIT_TESTS diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index 41b44bec2d0..478e5fc7e10 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -61,7 +61,6 @@ public: void addTargetTriple(); void addExtraCodeModelFlags(); - void enableExceptions(); void insertWrappedQtHeaders(); void addOptionsForLanguage(bool checkForBorlandExtensions = true); void updateLanguageOption(ProjectFile::Kind fileKind); diff --git a/tests/unit/unittest/compileroptionsbuilder-test.cpp b/tests/unit/unittest/compileroptionsbuilder-test.cpp index b469ecc49b6..fb45f7bc1fa 100644 --- a/tests/unit/unittest/compileroptionsbuilder-test.cpp +++ b/tests/unit/unittest/compileroptionsbuilder-test.cpp @@ -355,22 +355,6 @@ TEST_F(CompilerOptionsBuilder, AddTargetTriple) ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-target", "x86_64-apple-darwin10")); } -TEST_F(CompilerOptionsBuilder, EnableCExceptions) -{ - projectPart.languageVersion = ProjectExplorer::LanguageVersion::C99; - - compilerOptionsBuilder.enableExceptions(); - - ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fexceptions")); -} - -TEST_F(CompilerOptionsBuilder, EnableCXXExceptions) -{ - compilerOptionsBuilder.enableExceptions(); - - ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fcxx-exceptions", "-fexceptions")); -} - TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders) { compilerOptionsBuilder.insertWrappedQtHeaders(); @@ -457,9 +441,8 @@ TEST_F(CompilerOptionsBuilder, BuildAllOptions) ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre( "-nostdlibinc", "-c", "-m64", "-target", "x86_64-apple-darwin10", - "-arch", "x86_64", "-x", "c++", "-std=c++17", "-fcxx-exceptions", - "-fexceptions", "-Dfoo=bar", "-DprojectFoo=projectBar", - "-undef", + "-arch", "x86_64", "-x", "c++", "-std=c++17", "-Dfoo=bar", + "-DprojectFoo=projectBar", "-undef", "-I", IsPartOfHeader("wrappedQtHeaders"), "-I", IsPartOfHeader(QDir::toNativeSeparators("wrappedQtHeaders/QtCore").toStdString()), "-I", QDir::toNativeSeparators("/tmp/path"),