Revert rC330794 and some dependent tiny bug fixes

See Richard's humbling feedback here: 
http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20180423/226482.html
http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20180423/226486.html

Wish I'd had the patience to solicit the feedback prior to committing :)

Sorry for the noise guys.

Thank you Richard for being the steward that clang deserves!





git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@330888 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 0 insertions, 40 deletions

diff --git a/include/clang/AST/DeclTemplate.h b/include/clang/AST/DeclTemplate.h
index 1fe95f4a59..9c68352e76 100644
--- a/include/clang/AST/DeclTemplate.h
+++ b/include/clang/AST/DeclTemplate.h
@@ -3015,46 +3015,6 @@ public:
   static bool classofKind(Kind K) { return K == VarTemplate; }
 };
 
-/// \brief Represents a C++2a ([temp] p1) concept-definition.
-class ConceptDecl : public TemplateDecl {
-protected:
-  Expr *ConstraintExpr;
-
-  ConceptDecl(DeclContext *DC,
-              SourceLocation NameLoc, DeclarationName Name,
-              TemplateParameterList *Params,
-              Expr *ConstraintExpr)
-      : TemplateDecl(nullptr, Concept, DC, NameLoc, Name, Params),
-        ConstraintExpr(ConstraintExpr) {};
-public:
-  static ConceptDecl *Create(ASTContext &C, DeclContext *DC,
-                             SourceLocation NameLoc, DeclarationName Name,
-                             TemplateParameterList *Params,
-                             Expr *ConstraintExpr);
-  static ConceptDecl *CreateDeserialized(ASTContext &C, unsigned ID);
-
-  Expr *getConstraintExpr() const {
-    return ConstraintExpr;
-  }
-
-  void setConstraintExpr(Expr *CE) {
-    ConstraintExpr = CE;
-  }
-
-  SourceRange getSourceRange() const override LLVM_READONLY {
-    return SourceRange(getTemplateParameters()->getTemplateLoc(),
-                       getConstraintExpr()->getLocEnd());
-  }
-
-  // Implement isa/cast/dyncast/etc.
-  static bool classof(const Decl *D) { return classofKind(D->getKind()); }
-  static bool classofKind(Kind K) { return K == Concept; }
-
-  friend class ASTReader;
-  friend class ASTDeclReader;
-  friend class ASTDeclWriter;
-};
-
 inline NamedDecl *getAsNamedDecl(TemplateParameter P) {
   if (auto *PD = P.dyn_cast<TemplateTypeParmDecl *>())
     return PD;