maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Concepts] Remove the IsConcept bit and associated member functions from VarDecl 

because the information is now stored in TemplateDecl.

llvm-svn: 260155
This commit is contained in:
Nathan Wilson 2016-02-08 22:02:50 +00:00
parent 740f2ca672
commit 06dacd851f
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/include/clang/AST/Decl.h
View File

@ -816,9 +816,6 @@ protected:
/// \brief Whether this variable is (C++0x) constexpr.
unsigned IsConstexpr : 1;
/// \brief Whether this variable is a (C++ Concepts TS) concept.
unsigned IsConcept : 1;
/// \brief Whether this variable is the implicit variable for a lambda
/// init-capture.
unsigned IsInitCapture : 1;
@ -1194,15 +1191,6 @@ public:
NonParmVarDeclBits.IsConstexpr = IC;
}
/// Whether this variable is (C++ Concepts TS) concept.
bool isConcept() const {
return isa<ParmVarDecl>(this) ? false : NonParmVarDeclBits.IsConcept;
}
void setConcept(bool IC) {
assert(!isa<ParmVarDecl>(this));
NonParmVarDeclBits.IsConcept = IC;
}
/// Whether this variable is the implicit variable for a lambda init-capture.
bool isInitCapture() const {
return isa<ParmVarDecl>(this) ? false : NonParmVarDeclBits.IsInitCapture;

13
clang/lib/Sema/SemaDecl.cpp
View File

@ -5983,7 +5983,8 @@ Sema::ActOnVariableDeclarator(Scope *S, Declarator &D, DeclContext *DC,
NewVD->setConstexpr(true);
if (D.getDeclSpec().isConceptSpecified()) {
NewVD->setConcept(true);
if (VarTemplateDecl *VTD = NewVD->getDescribedVarTemplate())
VTD->setConcept();
// C++ Concepts TS [dcl.spec.concept]p2: A concept definition shall not
// be declared with the thread_local, inline, friend, or constexpr
@ -9760,10 +9761,12 @@ void Sema::ActOnUninitializedDecl(Decl *RealDecl,
// C++ Concepts TS [dcl.spec.concept]p1: [...] A variable template
// definition having the concept specifier is called a variable concept. A
// concept definition refers to [...] a variable concept and its initializer.
if (Var->isConcept()) {
Diag(Var->getLocation(), diag::err_var_concept_not_initialized);
Var->setInvalidDecl();
return;
if (VarTemplateDecl *VTD = Var->getDescribedVarTemplate()) {
if (VTD->isConcept()) {
Diag(Var->getLocation(), diag::err_var_concept_not_initialized);
Var->setInvalidDecl();
return;
}
}
// OpenCL v1.1 s6.5.3: variables declared in the constant address space must