From 0e3eb07cb5c77da9e5f1664a9dc5bddd52fd8207 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 26 Apr 2018 01:16:08 +0000 Subject: [PATCH] Revert addition of 'concept' to diagnostics in r330890. Matches revert in r330888 of r330794. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@330891 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.td | 12 ++++++------ include/clang/Sema/Sema.h | 1 - lib/Sema/SemaDecl.cpp | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 04840b690d..634485683e 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1984,7 +1984,7 @@ def err_auto_not_allowed : Error< "%select{'auto'|'decltype(auto)'|'__auto_type'|" "use of " "%select{class template|function template|variable template|alias template|" - "template template parameter|concept|template}2 %3 requires template arguments; " + "template template parameter|template}2 %3 requires template arguments; " "argument deduction}0 not allowed " "%select{in function prototype" "|in non-static struct member|in struct member" @@ -1998,7 +1998,7 @@ def err_auto_not_allowed : Error< def err_dependent_deduced_tst : Error< "typename specifier refers to " "%select{class template|function template|variable template|alias template|" - "template template parameter|concept|template}0 member in %1; " + "template template parameter|template}0 member in %1; " "argument deduction not allowed here">; def err_auto_not_allowed_var_inst : Error< "'auto' variable template instantiation is not allowed">; @@ -2078,7 +2078,7 @@ def err_deduced_class_template_compound_type : Error< "deduced class template specialization type">; def err_deduced_non_class_template_specialization_type : Error< "%select{|function template|variable template|alias template|" - "template template parameter|concept|template}0 %1 requires template arguments; " + "template template parameter|template}0 %1 requires template arguments; " "argument deduction only allowed for class templates">; def err_deduced_class_template_ctor_ambiguous : Error< "ambiguous deduction for template arguments of %0">; @@ -2106,7 +2106,7 @@ def err_deduction_guide_invalid_specifier : Error< def err_deduction_guide_name_not_class_template : Error< "cannot specify deduction guide for " "%select{|function template|variable template|alias template|" - "template template parameter|concept|dependent template name}0 %1">; + "template template parameter|dependent template name}0 %1">; def err_deduction_guide_wrong_scope : Error< "deduction guide must be declared in the same scope as template %q0">; def err_deduction_guide_defines_function : Error< @@ -3996,11 +3996,11 @@ def err_template_tag_noparams : Error< def err_template_missing_args : Error< "use of " "%select{class template|function template|variable template|alias template|" - "template template parameter|concept|template}0 %1 requires template arguments">; + "template template parameter|template}0 %1 requires template arguments">; def err_template_arg_list_different_arity : Error< "%select{too few|too many}0 template arguments for " "%select{class template|function template|variable template|alias template|" - "template template parameter|concept|template}1 %2">; + "template template parameter|template}1 %2">; def note_template_decl_here : Note<"template is declared here">; def err_template_arg_must_be_type : Error< "template argument for template type parameter must be a type">; diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 9897f0f23c..7f93c89d14 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -1820,7 +1820,6 @@ public: VarTemplate, AliasTemplate, TemplateTemplateParam, - Concept, DependentTemplate }; TemplateNameKindForDiagnostics diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 0c412d373c..8d17055ead 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -1161,8 +1161,6 @@ Sema::getTemplateNameKindForDiagnostics(TemplateName Name) { return TemplateNameKindForDiagnostics::AliasTemplate; if (isa(TD)) return TemplateNameKindForDiagnostics::TemplateTemplateParam; - if (isa(TD)) - return TemplateNameKindForDiagnostics::Concept; return TemplateNameKindForDiagnostics::DependentTemplate; } -- 2.40.0