commit e4a0c0ec78ed24bd564276f9af5dff1233ad4094
author Hubert Tong <hubert.reinterpretcast@gmail.com> Sat Jul 30 22:33:34 2016 +0000
committer Hubert Tong <hubert.reinterpretcast@gmail.com> Sat Jul 30 22:33:34 2016 +0000
tree 43e17b927c80dc42899de1109b3aa9046423541d
parent d08e18fc7dacd09e98211922130d06331b3b52e2

Reapply r276069 with workaround for MSVC 2013

llvm-svn: 277286

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 0d6ad9d..2aa6a14 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -651,6 +651,10 @@
                                            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(),
@@ -660,7 +664,8 @@
                          TemplateParameterList::Create(*this, SourceLocation(),
                                                        SourceLocation(),
                                                        CanonParams,
-                                                       SourceLocation()));
+                                                       SourceLocation(),
+                                                       CanonRequiresClause));
 
   // Get the new insert position for the node we care about.
   Canonical = CanonTemplateTemplateParms.FindNodeOrInsertPos(ID, InsertPos);