Author: gornishanov Date: Sat Oct 1 22:31:58 2016 New Revision: 283064 URL: http://llvm.org/viewvc/llvm-project?rev=283064&view=rev Log: [coroutines] Rename driver flag -fcoroutines to -fcoroutines-ts
Summary: Also makes -fcoroutines_ts to be both a Driver and CC1 flag. Patch mostly by EricWF. Reviewers: rnk, cfe-commits, rsmith, EricWF Subscribers: mehdi_amini Differential Revision: https://reviews.llvm.org/D25130 Added: cfe/trunk/test/Driver/coroutines.c cfe/trunk/test/Driver/coroutines.cpp Modified: cfe/trunk/include/clang/Basic/LangOptions.def cfe/trunk/include/clang/Driver/CC1Options.td cfe/trunk/include/clang/Driver/Options.td cfe/trunk/lib/Basic/IdentifierTable.cpp cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/lib/Frontend/CompilerInvocation.cpp cfe/trunk/lib/Frontend/InitPreprocessor.cpp cfe/trunk/lib/Sema/SemaDecl.cpp cfe/trunk/test/CodeGenCoroutines/microsoft-abi-operator-coawait.cpp cfe/trunk/test/Lexer/coroutines.cpp cfe/trunk/test/Lexer/cxx-features.cpp cfe/trunk/test/Parser/cxx1z-coroutines.cpp cfe/trunk/test/SemaCXX/coroutines.cpp Modified: cfe/trunk/include/clang/Basic/LangOptions.def URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/LangOptions.def?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/LangOptions.def (original) +++ cfe/trunk/include/clang/Basic/LangOptions.def Sat Oct 1 22:31:58 2016 @@ -133,7 +133,7 @@ LANGOPT(Freestanding, 1, 0, "freestandin LANGOPT(NoBuiltin , 1, 0, "disable builtin functions") LANGOPT(NoMathBuiltin , 1, 0, "disable math builtin functions") LANGOPT(GNUAsm , 1, 1, "GNU-style inline assembly") -LANGOPT(Coroutines , 1, 0, "C++ coroutines") +LANGOPT(CoroutinesTS , 1, 0, "C++ coroutines TS") BENIGN_LANGOPT(ThreadsafeStatics , 1, 1, "thread-safe static initializers") LANGOPT(POSIXThreads , 1, 0, "POSIX thread support") Modified: cfe/trunk/include/clang/Driver/CC1Options.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/CC1Options.td (original) +++ cfe/trunk/include/clang/Driver/CC1Options.td Sat Oct 1 22:31:58 2016 @@ -638,10 +638,6 @@ def fdefault_calling_conv_EQ : Joined<[" def finclude_default_header : Flag<["-"], "finclude-default-header">, HelpText<"Include the default header file for OpenCL">; -// C++ TSes. -def fcoroutines : Flag<["-"], "fcoroutines">, - HelpText<"Enable support for the C++ Coroutines TS">; - //===----------------------------------------------------------------------===// // Header Search Options //===----------------------------------------------------------------------===// Modified: cfe/trunk/include/clang/Driver/Options.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/Options.td (original) +++ cfe/trunk/include/clang/Driver/Options.td Sat Oct 1 22:31:58 2016 @@ -481,6 +481,13 @@ def fno_autolink : Flag <["-"], "fno-aut Flags<[DriverOption, CC1Option]>, HelpText<"Disable generation of linker directives for automatic library linking">; +// C++ Coroutines TS +def fcoroutines_ts : Flag <["-"], "fcoroutines-ts">, Group<f_Group>, + Flags<[DriverOption, CC1Option]>, + HelpText<"Enable support for the C++ Coroutines TS">; +def fno_coroutines_ts : Flag <["-"], "fno-coroutines-ts">, Group<f_Group>, + Flags<[DriverOption]>; + def fembed_bitcode_EQ : Joined<["-"], "fembed-bitcode=">, Group<f_Group>, Flags<[DriverOption, CC1Option]>, MetaVarName<"<option>">, HelpText<"Embed LLVM bitcode (option: off, all, bitcode, marker)">; Modified: cfe/trunk/lib/Basic/IdentifierTable.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/IdentifierTable.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/lib/Basic/IdentifierTable.cpp (original) +++ cfe/trunk/lib/Basic/IdentifierTable.cpp Sat Oct 1 22:31:58 2016 @@ -150,7 +150,7 @@ static KeywordStatus getKeywordStatus(co if (LangOpts.ObjC2 && (Flags & KEYARC)) return KS_Enabled; if (LangOpts.ObjC2 && (Flags & KEYOBJC2)) return KS_Enabled; if (LangOpts.ConceptsTS && (Flags & KEYCONCEPTS)) return KS_Enabled; - if (LangOpts.Coroutines && (Flags & KEYCOROUTINES)) return KS_Enabled; + if (LangOpts.CoroutinesTS && (Flags & KEYCOROUTINES)) return KS_Enabled; if (LangOpts.ModulesTS && (Flags & KEYMODULES)) return KS_Enabled; if (LangOpts.CPlusPlus && (Flags & KEYCXX11)) return KS_Future; return KS_Disabled; Modified: cfe/trunk/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Tools.cpp (original) +++ cfe/trunk/lib/Driver/Tools.cpp Sat Oct 1 22:31:58 2016 @@ -5416,6 +5416,12 @@ void Clang::ConstructJob(Compilation &C, CmdArgs.push_back("-fblocks-runtime-optional"); } + if (Args.hasFlag(options::OPT_fcoroutines_ts, options::OPT_fno_coroutines_ts, + false) && + types::isCXX(InputType)) { + CmdArgs.push_back("-fcoroutines-ts"); + } + // -fmodules enables the use of precompiled modules (off by default). // Users can pass -fno-cxx-modules to turn off modules support for // C++/Objective-C++ programs. Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original) +++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Sat Oct 1 22:31:58 2016 @@ -1916,7 +1916,7 @@ static void ParseLangArgs(LangOptions &O Opts.Blocks = Args.hasArg(OPT_fblocks) || (Opts.OpenCL && Opts.OpenCLVersion >= 200); Opts.BlocksRuntimeOptional = Args.hasArg(OPT_fblocks_runtime_optional); - Opts.Coroutines = Args.hasArg(OPT_fcoroutines); + Opts.CoroutinesTS = Args.hasArg(OPT_fcoroutines_ts); Opts.ModulesTS = Args.hasArg(OPT_fmodules_ts); Opts.Modules = Args.hasArg(OPT_fmodules) || Opts.ModulesTS; Opts.ModulesStrictDeclUse = Args.hasArg(OPT_fmodules_strict_decluse); Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original) +++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Sat Oct 1 22:31:58 2016 @@ -526,7 +526,7 @@ static void InitializeCPlusPlusFeatureTe // TS features. if (LangOpts.ConceptsTS) Builder.defineMacro("__cpp_experimental_concepts", "1"); - if (LangOpts.Coroutines) + if (LangOpts.CoroutinesTS) Builder.defineMacro("__cpp_coroutines", "1"); } Modified: cfe/trunk/lib/Sema/SemaDecl.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaDecl.cpp (original) +++ cfe/trunk/lib/Sema/SemaDecl.cpp Sat Oct 1 22:31:58 2016 @@ -11602,7 +11602,7 @@ Decl *Sema::ActOnFinishFunctionBody(Decl sema::AnalysisBasedWarnings::Policy WP = AnalysisWarnings.getDefaultPolicy(); sema::AnalysisBasedWarnings::Policy *ActivePolicy = nullptr; - if (getLangOpts().Coroutines && !getCurFunction()->CoroutineStmts.empty()) + if (getLangOpts().CoroutinesTS && !getCurFunction()->CoroutineStmts.empty()) CheckCompletedCoroutineBody(FD, Body); if (FD) { Modified: cfe/trunk/test/CodeGenCoroutines/microsoft-abi-operator-coawait.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCoroutines/microsoft-abi-operator-coawait.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCoroutines/microsoft-abi-operator-coawait.cpp (original) +++ cfe/trunk/test/CodeGenCoroutines/microsoft-abi-operator-coawait.cpp Sat Oct 1 22:31:58 2016 @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc18.0.0 -fcoroutines -emit-llvm %s -o - -std=c++14 -disable-llvm-passes | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-pc-windows-msvc18.0.0 -fcoroutines-ts -emit-llvm %s -o - -std=c++14 -disable-llvm-passes | FileCheck %s struct no_suspend { bool await_ready() { return true; } template <typename F> void await_suspend(F) {} Added: cfe/trunk/test/Driver/coroutines.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/coroutines.c?rev=283064&view=auto ============================================================================== --- cfe/trunk/test/Driver/coroutines.c (added) +++ cfe/trunk/test/Driver/coroutines.c Sat Oct 1 22:31:58 2016 @@ -0,0 +1,6 @@ +// RUN: %clang -### %s 2>&1 | FileCheck -check-prefix=CHECK-NO-CORO %s +// RUN: %clang -fcoroutines-ts -### %s 2>&1 | FileCheck -check-prefix=CHECK-NO-CORO %s +// RUN: %clang -fno-coroutines-ts -### %s 2>&1 | FileCheck -check-prefix=CHECK-NO-CORO %s +// RUN: %clang -fno-coroutines-ts -fcoroutines-ts -### %s 2>&1 | FileCheck -check-prefix=CHECK-NO-CORO %s +// CHECK-NO-CORO-NOT: -fcoroutines-ts + Added: cfe/trunk/test/Driver/coroutines.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/coroutines.cpp?rev=283064&view=auto ============================================================================== --- cfe/trunk/test/Driver/coroutines.cpp (added) +++ cfe/trunk/test/Driver/coroutines.cpp Sat Oct 1 22:31:58 2016 @@ -0,0 +1,9 @@ +// RUN: %clang -### %s 2>&1 | FileCheck -check-prefix=CHECK-NO-CORO %s +// RUN: %clang -fcoroutines-ts -fno-coroutines-ts -### %s 2>&1 | FileCheck -check-prefix=CHECK-NO-CORO %s +// RUN: %clang -fno-coroutines-ts -### %s 2>&1 | FileCheck -check-prefix=CHECK-NO-CORO %s +// CHECK-NO-CORO-NOT: -fcoroutines-ts + +// RUN: %clang -fcoroutines-ts -### %s 2>&1 | FileCheck -check-prefix=CHECK-HAS-CORO %s +// RUN: %clang -fno-coroutines-ts -fcoroutines-ts -### %s 2>&1 | FileCheck -check-prefix=CHECK-HAS-CORO %s +// CHECK-HAS-CORO: -fcoroutines-ts + Modified: cfe/trunk/test/Lexer/coroutines.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/coroutines.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/test/Lexer/coroutines.cpp (original) +++ cfe/trunk/test/Lexer/coroutines.cpp Sat Oct 1 22:31:58 2016 @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only %s -// RUN: %clang_cc1 -fcoroutines -DCORO -fsyntax-only %s +// RUN: %clang_cc1 -fcoroutines-ts -DCORO -fsyntax-only %s #ifdef CORO #define CORO_KEYWORD(NAME) _Static_assert(!__is_identifier(NAME), #NAME) Modified: cfe/trunk/test/Lexer/cxx-features.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/cxx-features.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/test/Lexer/cxx-features.cpp (original) +++ cfe/trunk/test/Lexer/cxx-features.cpp Sat Oct 1 22:31:58 2016 @@ -5,7 +5,7 @@ // RUN: %clang_cc1 -std=c++1z -fcxx-exceptions -fsized-deallocation -verify %s // RUN: %clang_cc1 -std=c++1z -fcxx-exceptions -fsized-deallocation -fconcepts-ts -DCONCEPTS_TS=1 -verify %s // RUN: %clang_cc1 -fno-rtti -verify %s -DNO_EXCEPTIONS -DNO_RTTI -// RUN: %clang_cc1 -fcoroutines -DNO_EXCEPTIONS -DCOROUTINES -verify %s +// RUN: %clang_cc1 -fcoroutines-ts -DNO_EXCEPTIONS -DCOROUTINES -verify %s // expected-no-diagnostics Modified: cfe/trunk/test/Parser/cxx1z-coroutines.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx1z-coroutines.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/test/Parser/cxx1z-coroutines.cpp (original) +++ cfe/trunk/test/Parser/cxx1z-coroutines.cpp Sat Oct 1 22:31:58 2016 @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -std=c++11 -fcoroutines %s -verify +// RUN: %clang_cc1 -std=c++11 -fcoroutines-ts %s -verify template<typename T, typename U> U f(T t) { Modified: cfe/trunk/test/SemaCXX/coroutines.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/coroutines.cpp?rev=283064&r1=283063&r2=283064&view=diff ============================================================================== --- cfe/trunk/test/SemaCXX/coroutines.cpp (original) +++ cfe/trunk/test/SemaCXX/coroutines.cpp Sat Oct 1 22:31:58 2016 @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -std=c++14 -fcoroutines -verify %s +// RUN: %clang_cc1 -std=c++14 -fcoroutines-ts -verify %s void no_coroutine_traits_bad_arg_await() { co_await a; // expected-error {{include <coroutine>}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
