commit 286547a337d94c44b2eae7e7ebd78db5a50f9182
author Hubert Tong <hubert.reinterpretcast@gmail.com> Wed Jul 20 01:05:31 2016 +0000
committer Hubert Tong <hubert.reinterpretcast@gmail.com> Wed Jul 20 01:05:31 2016 +0000
tree d54f1bfe21b33fb9b16b34be5bbf10dcc81ac89c
parent 9aa955b3ae133c9d4ab73e837b2be62fcb4ed173

Revert r276069: MSVC bots not happy

llvm-svn: 276074

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 05b30a4..e54c88f 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -651,10 +651,6 @@
                                            cast<TemplateTemplateParmDecl>(*P)));
   }
 
-  assert(!TTP->getRequiresClause() &&
-         "Unexpected requires-clause on template template-parameter");
-  LLVM_CONSTEXPR Expr *const CanonRequiresClause = nullptr;
-
   TemplateTemplateParmDecl *CanonTTP
     = TemplateTemplateParmDecl::Create(*this, getTranslationUnitDecl(), 
                                        SourceLocation(), TTP->getDepth(),
@@ -664,8 +660,7 @@
                          TemplateParameterList::Create(*this, SourceLocation(),
                                                        SourceLocation(),
                                                        CanonParams,
-                                                       SourceLocation(),
-                                                       CanonRequiresClause));
+                                                       SourceLocation()));
 
   // Get the new insert position for the node we care about.
   Canonical = CanonTemplateTemplateParms.FindNodeOrInsertPos(ID, InsertPos);