From d6fdc583abcb3f4ad7f33a17d115d17342bb8cdd Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 19 Nov 2015 17:49:59 +0000 Subject: [PATCH] clang-cl: Make /W4 imply -Wall -Wextra (PR25563) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253582 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/UsersManual.rst | 2 +- include/clang/Driver/CLCompatOptions.td | 12 ++++++------ lib/Driver/Tools.cpp | 20 ++++++++++++++++++++ test/Driver/cl-options.c | 7 ++++++- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/docs/UsersManual.rst b/docs/UsersManual.rst index b50989471d..ca2be4b46e 100644 --- a/docs/UsersManual.rst +++ b/docs/UsersManual.rst @@ -2173,7 +2173,7 @@ Execute ``clang-cl /?`` to see a list of supported options: /W1 Enable -Wall /W2 Enable -Wall /W3 Enable -Wall - /W4 Enable -Wall + /W4 Enable -Wall and -Wextra /Wall Enable -Wall /WX- Do not treat warnings as errors /WX Treat warnings as errors diff --git a/include/clang/Driver/CLCompatOptions.td b/include/clang/Driver/CLCompatOptions.td index a8282b46e0..e1590eede7 100644 --- a/include/clang/Driver/CLCompatOptions.td +++ b/include/clang/Driver/CLCompatOptions.td @@ -115,12 +115,12 @@ def _SLASH_showIncludes : CLFlag<"showIncludes">, Alias; def _SLASH_U : CLJoinedOrSeparate<"U">, HelpText<"Undefine macro">, MetaVarName<"">, Alias; -def _SLASH_W0 : CLFlag<"W0">, HelpText<"Disable all warnings">, Alias; -def _SLASH_W1 : CLFlag<"W1">, HelpText<"Enable -Wall">, Alias; -def _SLASH_W2 : CLFlag<"W2">, HelpText<"Enable -Wall">, Alias; -def _SLASH_W3 : CLFlag<"W3">, HelpText<"Enable -Wall">, Alias; -def _SLASH_W4 : CLFlag<"W4">, HelpText<"Enable -Wall">, Alias; -def _SLASH_Wall : CLFlag<"Wall">, HelpText<"Enable -Wall">, Alias; +def _SLASH_W0 : CLFlag<"W0">, HelpText<"Disable all warnings">; +def _SLASH_W1 : CLFlag<"W1">, HelpText<"Enable -Wall">; +def _SLASH_W2 : CLFlag<"W2">, HelpText<"Enable -Wall">; +def _SLASH_W3 : CLFlag<"W3">, HelpText<"Enable -Wall">; +def _SLASH_W4 : CLFlag<"W4">, HelpText<"Enable -Wall and -Wextra">; +def _SLASH_Wall : CLFlag<"Wall">, HelpText<"Enable -Wall">; def _SLASH_WX : CLFlag<"WX">, HelpText<"Treat warnings as errors">, Alias, AliasArgs<["error"]>; def _SLASH_WX_ : CLFlag<"WX-">, HelpText<"Do not treat warnings as errors">, diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index d6a3a1f482..1212b2bcb7 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -5684,6 +5684,26 @@ void Clang::AddClangCLArgs(const ArgList &Args, ArgStringList &CmdArgs, else CmdArgs.push_back("msvc"); } + + if (Arg *A = + Args.getLastArg(options::OPT__SLASH_W0, options::OPT__SLASH_W1, + options::OPT__SLASH_W2, options::OPT__SLASH_W3, + options::OPT__SLASH_W4, options::OPT__SLASH_Wall)) { + switch (A->getOption().getID()) { + case options::OPT__SLASH_W0: + CmdArgs.push_back("-w"); + break; + case options::OPT__SLASH_W4: + CmdArgs.push_back("-Wextra"); + // Fallthrough. + case options::OPT__SLASH_W1: + case options::OPT__SLASH_W2: + case options::OPT__SLASH_W3: + case options::OPT__SLASH_Wall: + CmdArgs.push_back("-Wall"); + break; + } + } } visualstudio::Compiler *Clang::getCLFallback() const { diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c index 180b15ead3..c21d104ad9 100644 --- a/test/Driver/cl-options.c +++ b/test/Driver/cl-options.c @@ -173,10 +173,15 @@ // RUN: %clang_cl /W1 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s // RUN: %clang_cl /W2 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s // RUN: %clang_cl /W3 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s -// RUN: %clang_cl /W4 -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s // RUN: %clang_cl /Wall -### -- %s 2>&1 | FileCheck -check-prefix=W1 %s // W1: -Wall +// RUN: %clang_cl /W4 -### -- %s 2>&1 | FileCheck -check-prefix=W4 %s +// W4: -Wextra +// W4: -Wall +// RUN: %clang_cl /W4 /W1 -### -- %s 2>&1 | FileCheck -check-prefix=W4W1 %s +// W4W1-NOT: -Wextra + // RUN: %clang_cl /WX -### -- %s 2>&1 | FileCheck -check-prefix=WX %s // WX: -Werror -- 2.50.1