diff --git a/clang/include/clang/Basic/Features.def b/clang/include/clang/Basic/Features.def --- a/clang/include/clang/Basic/Features.def +++ b/clang/include/clang/Basic/Features.def @@ -173,6 +173,7 @@ FEATURE(cxx_trailing_return, LangOpts.CPlusPlus11) FEATURE(cxx_unicode_literals, LangOpts.CPlusPlus11) FEATURE(cxx_unrestricted_unions, LangOpts.CPlusPlus11) +FEATURE(cxx_unstable, LangOpts.Unstable) FEATURE(cxx_user_literals, LangOpts.CPlusPlus11) FEATURE(cxx_variadic_templates, LangOpts.CPlusPlus11) // C++14 features diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def --- a/clang/include/clang/Basic/LangOptions.def +++ b/clang/include/clang/Basic/LangOptions.def @@ -150,6 +150,7 @@ LANGOPT(Coroutines , 1, 0, "C++20 coroutines") LANGOPT(DllExportInlines , 1, 1, "dllexported classes dllexport inline methods") LANGOPT(RelaxedTemplateTemplateArgs, 1, 0, "C++17 relaxed matching of template template arguments") +LANGOPT(Unstable , 1, 0, "Enable unstable and experimental features") LANGOPT(DoubleSquareBracketAttributes, 1, 0, "'[[]]' attributes extension for all language standard modes") diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -1160,6 +1160,11 @@ PosFlag, NegFlag>; +defm unstable : BoolFOption<"unstable", + LangOpts<"Unstable">, DefaultFalse, + PosFlag, + NegFlag>; + def fembed_offload_object_EQ : Joined<["-"], "fembed-offload-object=">, Group, Flags<[NoXarchOption, CC1Option]>, HelpText<"Embed Offloading device-side binary into host object file as a section.">, diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5764,6 +5764,13 @@ CmdArgs.push_back(A->getValue()); } + if (Args.hasArg(options::OPT_funstable)) { + CmdArgs.push_back("-funstable"); + if (!Args.hasArg(options::OPT_fno_coroutines_ts)) + CmdArgs.push_back("-fcoroutines-ts"); + CmdArgs.push_back("-fmodules-ts"); + } + if (Args.hasArg(options::OPT_fexperimental_new_constant_interpreter)) CmdArgs.push_back("-fexperimental-new-constant-interpreter"); diff --git a/clang/test/Driver/unstable-flag.cpp b/clang/test/Driver/unstable-flag.cpp new file mode 100644 --- /dev/null +++ b/clang/test/Driver/unstable-flag.cpp @@ -0,0 +1,5 @@ +// RUN: %clang -funstable -### %s 2>&1 | FileCheck %s + +// CHECK: -funstable +// CHECK: -fcoroutines-ts +// CHECK: -fmodules-ts diff --git a/clang/test/Lexer/has_feature_cxx_unstable.cpp b/clang/test/Lexer/has_feature_cxx_unstable.cpp new file mode 100644 --- /dev/null +++ b/clang/test/Lexer/has_feature_cxx_unstable.cpp @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -funstable -E %s -o - | FileCheck --check-prefix=CHECK-UNSTABLE %s +// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-UNSTABLE %s + +#if __has_feature(cxx_unstable) +int has_cxx_unstable(); +#else +int has_no_cxx_unstable(); +#endif +// CHECK-UNSTABLE: int has_cxx_unstable(); +// CHECK-NO-UNSTABLE: int has_no_cxx_unstable();