This is an archive of the discontinued LLVM Phabricator instance.

Differential D103155

[clang-cl] Add driver support for /std:c++20 and bump /std:c++latest (PR50465)
ClosedPublic

Authored by hans on May 26 2021, 4:09 AM.

Details

Reviewers
thakis
rnk
CaseyCarter
Commits
rGa8f75d497daa: [clang-cl] Add driver support for /std:c++20 and bump /std:c++latest (PR50465)
Summary

VS 2019 16.11 (just released in Preview) is adding support for the /std:c++20 option and bumping /std:c++latest to "post-c++20". This updates clang-cl to match.

Diff Detail

Event Timeline

hans created this revision.May 26 2021, 4:09 AM
Herald added a subscriber: dang. · View Herald TranscriptMay 26 2021, 4:09 AM
hans requested review of this revision.May 26 2021, 4:09 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 26 2021, 4:09 AM
thakis accepted this revision.May 26 2021, 4:15 AM
This revision is now accepted and ready to land.May 26 2021, 4:15 AM
Harbormaster completed remote builds in B106261: Diff 347914.May 26 2021, 4:46 AM
CaseyCarter accepted this revision.May 26 2021, 6:38 AM
CaseyCarter added a subscriber: CaseyCarter.

Looks great - thanks Hans!

Closed by commit rGa8f75d497daa: [clang-cl] Add driver support for /std:c++20 and bump /std:c++latest (PR50465) (authored by hans). · Explain WhyMay 26 2021, 7:09 AM
This revision was automatically updated to reflect the committed changes.
hans added a commit: rGa8f75d497daa: [clang-cl] Add driver support for /std:c++20 and bump /std:c++latest (PR50465).

Revision Contents

PathSize
clang/
include/
clang/
Driver/
2 lines
lib/
Driver/
ToolChains/
3 lines
test/
Driver/
5 lines

Diff 347954

clang/include/clang/Driver/Options.td

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 5,928 Lines • ▼ Show 20 Linesdef _SLASH_showFilenames_ : CLFlag<"showFilenames-">,
HelpText<"Do not print the name of each compiled file (default)">; HelpText<"Do not print the name of each compiled file (default)">;
def _SLASH_source_charset : CLCompileJoined<"source-charset:">, def _SLASH_source_charset : CLCompileJoined<"source-charset:">,
HelpText<"Set source encoding, supports only UTF-8">, HelpText<"Set source encoding, supports only UTF-8">,
Alias<finput_charset_EQ>; Alias<finput_charset_EQ>;
def _SLASH_execution_charset : CLCompileJoined<"execution-charset:">, def _SLASH_execution_charset : CLCompileJoined<"execution-charset:">,
HelpText<"Set runtime encoding, supports only UTF-8">, HelpText<"Set runtime encoding, supports only UTF-8">,
Alias<fexec_charset_EQ>; Alias<fexec_charset_EQ>;
def _SLASH_std : CLCompileJoined<"std:">, def _SLASH_std : CLCompileJoined<"std:">,
HelpText<"Set language version (c++14,c++17,c++latest,c11,c17)">; HelpText<"Set language version (c++14,c++17,c++20,c++latest,c11,c17)">;
def _SLASH_U : CLJoinedOrSeparate<"U">, HelpText<"Undefine macro">, def _SLASH_U : CLJoinedOrSeparate<"U">, HelpText<"Undefine macro">,
MetaVarName<"<macro>">, Alias<U>; MetaVarName<"<macro>">, Alias<U>;
def _SLASH_validate_charset : CLFlag<"validate-charset">, def _SLASH_validate_charset : CLFlag<"validate-charset">,
Alias<W_Joined>, AliasArgs<["invalid-source-encoding"]>; Alias<W_Joined>, AliasArgs<["invalid-source-encoding"]>;
def _SLASH_validate_charset_ : CLFlag<"validate-charset-">, def _SLASH_validate_charset_ : CLFlag<"validate-charset-">,
Alias<W_Joined>, AliasArgs<["no-invalid-source-encoding"]>; Alias<W_Joined>, AliasArgs<["no-invalid-source-encoding"]>;
def _SLASH_W0 : CLFlag<"W0">, HelpText<"Disable all warnings">, Alias<w>; def _SLASH_W0 : CLFlag<"W0">, HelpText<"Disable all warnings">, Alias<w>;
def _SLASH_W1 : CLFlag<"W1">, HelpText<"Enable -Wall">, Alias<Wall>; def _SLASH_W1 : CLFlag<"W1">, HelpText<"Enable -Wall">, Alias<Wall>;
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines

clang/lib/Driver/ToolChains/Clang.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6,074 Lines • ▼ Show 20 Lines
} }
if (ImplyVCPPCXXVer) { if (ImplyVCPPCXXVer) {
StringRef LanguageStandard; StringRef LanguageStandard;
if (const Arg *StdArg = Args.getLastArg(options::OPT__SLASH_std)) { if (const Arg *StdArg = Args.getLastArg(options::OPT__SLASH_std)) {
Std = StdArg; Std = StdArg;
LanguageStandard = llvm::StringSwitch<StringRef>(StdArg->getValue()) LanguageStandard = llvm::StringSwitch<StringRef>(StdArg->getValue())
.Case("c++14", "-std=c++14") .Case("c++14", "-std=c++14")
.Case("c++17", "-std=c++17") .Case("c++17", "-std=c++17")
.Case("c++latest", "-std=c++20") .Case("c++20", "-std=c++20")
.Case("c++latest", "-std=c++2b")
.Default(""); .Default("");
if (LanguageStandard.empty()) if (LanguageStandard.empty())
D.Diag(clang::diag::warn_drv_unused_argument) D.Diag(clang::diag::warn_drv_unused_argument)
<< StdArg->getAsString(Args); << StdArg->getAsString(Args);
} }
if (LanguageStandard.empty()) { if (LanguageStandard.empty()) {
if (IsMSVC2015Compatible) if (IsMSVC2015Compatible)
▲ Show 20 Lines • Show All 1,648 Lines • Show Last 20 Lines

clang/test/Driver/cl-options.c

Show First 20 Lines • Show All 588 Lines • ▼ Show 20 Lines
// CXX14: -std=c++14 // CXX14: -std=c++14
// RUN: %clang_cl -fmsc-version=1900 -TP -std:c++14 -### -- %s 2>&1 | FileCheck -check-prefix=STDCXX14 %s // RUN: %clang_cl -fmsc-version=1900 -TP -std:c++14 -### -- %s 2>&1 | FileCheck -check-prefix=STDCXX14 %s
// STDCXX14: -std=c++14 // STDCXX14: -std=c++14
// RUN: %clang_cl -fmsc-version=1900 -TP -std:c++17 -### -- %s 2>&1 | FileCheck -check-prefix=STDCXX17 %s // RUN: %clang_cl -fmsc-version=1900 -TP -std:c++17 -### -- %s 2>&1 | FileCheck -check-prefix=STDCXX17 %s
// STDCXX17: -std=c++17 // STDCXX17: -std=c++17
// RUN: %clang_cl -fmsc-version=1900 -TP -std:c++20 -### -- %s 2>&1 | FileCheck -check-prefix=STDCXX20 %s
// STDCXX20: -std=c++20
// RUN: %clang_cl -fmsc-version=1900 -TP -std:c++latest -### -- %s 2>&1 | FileCheck -check-prefix=STDCXXLATEST %s // RUN: %clang_cl -fmsc-version=1900 -TP -std:c++latest -### -- %s 2>&1 | FileCheck -check-prefix=STDCXXLATEST %s
// STDCXXLATEST: -std=c++20 // STDCXXLATEST: -std=c++2b
// RUN: env CL="/Gy" %clang_cl -### -- %s 2>&1 | FileCheck -check-prefix=ENV-CL %s // RUN: env CL="/Gy" %clang_cl -### -- %s 2>&1 | FileCheck -check-prefix=ENV-CL %s
// ENV-CL: "-ffunction-sections" // ENV-CL: "-ffunction-sections"
// RUN: env CL="/Gy" _CL_="/Gy- -- %s" %clang_cl -### 2>&1 | FileCheck -check-prefix=ENV-_CL_ %s // RUN: env CL="/Gy" _CL_="/Gy- -- %s" %clang_cl -### 2>&1 | FileCheck -check-prefix=ENV-_CL_ %s
// ENV-_CL_-NOT: "-ffunction-sections" // ENV-_CL_-NOT: "-ffunction-sections"
// RUN: env CL="%s" _CL_="%s" not %clang --rsp-quoting=windows -c // RUN: env CL="%s" _CL_="%s" not %clang --rsp-quoting=windows -c
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines