From 720bfb489186a9efe1b14e43324530cc489bbac7 Mon Sep 17 00:00:00 2001
From: Hubert Tong <hubert.reinterpretcast@gmail.com>
Date: Thu, 30 Jul 2015 21:20:55 +0000
Subject: [PATCH] [Concepts] Add diagnostic: non template declaration
Summary:
Adding diagnostic for concepts declared as non template (function
or variable)
Reviewers: faisalv, fraggamuffin, rsmith, hubert.reinterpretcast
Subscribers: nwilson, cfe-commits
Differential Revision: http://reviews.llvm.org/D11490
Patch by Nathan Wilson!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@243690 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/clang/Basic/DiagnosticSemaKinds.td | 2 ++
lib/Sema/SemaDecl.cpp | 6 ++++++
test/Parser/cxx-concept-declaration.cpp | 4 +---
test/SemaCXX/cxx-concept-declaration.cpp | 4 ++++
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 44508d59024..c300d6fe423 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1965,6 +1965,8 @@ def note_private_extern : Note<
"use __attribute__((visibility(\"hidden\"))) attribute instead">;
// C++ Concepts TS
+def err_concept_decl_non_template : Error<
+ "'concept' can only appear on the definition of a function template or variable template">;
def err_concept_decls_may_only_appear_in_namespace_scope : Error<
"concept declarations may only appear in namespace scope">;
def err_function_concept_not_defined : Error<
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 98db0c7b5ae..f273de12583 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -4865,6 +4865,12 @@ NamedDecl *Sema::HandleDeclarator(Scope *S, Declarator &D,
// C++ Concepts TS [dcl.spec.concept]p1: The concept specifier shall be
// applied only to the definition of a function template or variable
// template, declared in namespace scope
+ if (!TemplateParamLists.size()) {
+ Diag(D.getDeclSpec().getConceptSpecLoc(),
+ diag::err_concept_decl_non_template);
+ return nullptr;
+ }
+
if (!DC->getRedeclContext()->isFileContext()) {
Diag(D.getIdentifierLoc(),
diag::err_concept_decls_may_only_appear_in_namespace_scope);
diff --git a/test/Parser/cxx-concept-declaration.cpp b/test/Parser/cxx-concept-declaration.cpp
index 591629ca285..fad5975e4a9 100644
--- a/test/Parser/cxx-concept-declaration.cpp
+++ b/test/Parser/cxx-concept-declaration.cpp
@@ -25,6 +25,4 @@ template<typename T> concept concept bool C6 = true; // expected-warning {{dupli
template<typename T> concept concept bool C7() { return true; } // expected-warning {{duplicate 'concept' declaration specifier}}
-concept D1 = true; // expected-error {{C++ requires a type specifier for all declarations}}
-
-template<concept T> concept bool D2 = true; // expected-error {{unknown type name 'T'}}
+template<concept T> concept bool D1 = true; // expected-error {{unknown type name 'T'}}
diff --git a/test/SemaCXX/cxx-concept-declaration.cpp b/test/SemaCXX/cxx-concept-declaration.cpp
index 6bc2d482dcb..f9878bc5812 100644
--- a/test/SemaCXX/cxx-concept-declaration.cpp
+++ b/test/SemaCXX/cxx-concept-declaration.cpp
@@ -15,3 +15,7 @@ struct B {
struct C {
template<typename T> static concept bool D3 = true; // expected-error {{concept declarations may only appear in namespace scope}}
};
+
+concept bool D4() { return true; } // expected-error {{'concept' can only appear on the definition of a function template or variable template}}
+
+concept bool D5 = true; // expected-error {{'concept' can only appear on the definition of a function template or variable template}}
--
GitLab