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/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 967c2be..208afa6 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -2932,10 +2932,14 @@
   if (Invalid)
     return nullptr;
 
+  // Note: we substitute into associated constraints later
+  Expr *const UninstantiatedRequiresClause = L->getRequiresClause();
+
   TemplateParameterList *InstL
     = TemplateParameterList::Create(SemaRef.Context, L->getTemplateLoc(),
                                     L->getLAngleLoc(), Params,
-                                    L->getRAngleLoc());
+                                    L->getRAngleLoc(),
+                                    UninstantiatedRequiresClause);
   return InstL;
 }