diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-04-27 01:17:05 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-04-27 01:17:05 +0000 |
| commit | 8c8fb8049080bb3522c3cd8349b1d2f79c54531e (patch) | |
| tree | f9bdd832ff70ddaa67a90ad38fdd813b44e9fa7c /clang/lib/Frontend/CompilerInvocation.cpp | |
| parent | 26beacc19e167381334032cc25fe9fed0fda139d (diff) | |
| download | bcm5719-llvm-8c8fb8049080bb3522c3cd8349b1d2f79c54531e.tar.gz bcm5719-llvm-8c8fb8049080bb3522c3cd8349b1d2f79c54531e.zip | |
Improve diagnostics for bad -std= flag.
Don't list deprecated -std= values (c++0x etc). Only produce one line of output
per standard, even if we know it by multiple names.
In passing, add missing -std=gnu++03 alias (supported by GCC), and add new
spelling '-std=cl1.0' for OpenCL 1.0 for consistency with the other values,
with the same meaning as the preexisting '-std=cl'.
llvm-svn: 301507
Diffstat (limited to 'clang/lib/Frontend/CompilerInvocation.cpp')
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 481ce5bfa62..2cc48e1d1de 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1575,7 +1575,7 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK, case InputKind::LLVM_IR: llvm_unreachable("Invalid input kind!"); case InputKind::OpenCL: - LangStd = LangStandard::lang_opencl; + LangStd = LangStandard::lang_opencl10; break; case InputKind::CUDA: LangStd = LangStandard::lang_cuda; @@ -1621,7 +1621,7 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK, // Set OpenCL Version. Opts.OpenCL = Std.isOpenCL(); - if (LangStd == LangStandard::lang_opencl) + if (LangStd == LangStandard::lang_opencl10) Opts.OpenCLVersion = 100; else if (LangStd == LangStandard::lang_opencl11) Opts.OpenCLVersion = 110; @@ -1778,8 +1778,20 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, const LangStandard &Std = LangStandard::getLangStandardForKind( static_cast<LangStandard::Kind>(KindValue)); if (IsInputCompatibleWithStandard(IK, Std)) { - Diags.Report(diag::note_drv_use_standard) - << Std.getName() << Std.getDescription(); + auto Diag = Diags.Report(diag::note_drv_use_standard); + Diag << Std.getName() << Std.getDescription(); + unsigned NumAliases = 0; +#define LANGSTANDARD(id, name, lang, desc, features) +#define LANGSTANDARD_ALIAS(id, alias) \ + if (KindValue == LangStandard::lang_##id) ++NumAliases; +#define LANGSTANDARD_ALIAS_DEPR(id, alias) +#include "clang/Frontend/LangStandards.def" + Diag << NumAliases; +#define LANGSTANDARD(id, name, lang, desc, features) +#define LANGSTANDARD_ALIAS(id, alias) \ + if (KindValue == LangStandard::lang_##id) Diag << alias; +#define LANGSTANDARD_ALIAS_DEPR(id, alias) +#include "clang/Frontend/LangStandards.def" } } } else { @@ -1798,7 +1810,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, if (const Arg *A = Args.getLastArg(OPT_cl_std_EQ)) { LangStandard::Kind OpenCLLangStd = llvm::StringSwitch<LangStandard::Kind>(A->getValue()) - .Cases("cl", "CL", LangStandard::lang_opencl) + .Cases("cl", "CL", LangStandard::lang_opencl10) .Cases("cl1.1", "CL1.1", LangStandard::lang_opencl11) .Cases("cl1.2", "CL1.2", LangStandard::lang_opencl12) .Cases("cl2.0", "CL2.0", LangStandard::lang_opencl20) |
