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/ASTImporter.cpp

diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index bc1f9f9..76b495f8 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -2262,11 +2262,21 @@
     ToParams.push_back(cast<NamedDecl>(To));
   }
   
+  Expr *ToRequiresClause;
+  if (Expr *const R = Params->getRequiresClause()) {
+    ToRequiresClause = Importer.Import(R);
+    if (!ToRequiresClause)
+      return nullptr;
+  } else {
+    ToRequiresClause = nullptr;
+  }
+
   return TemplateParameterList::Create(Importer.getToContext(),
                                        Importer.Import(Params->getTemplateLoc()),
                                        Importer.Import(Params->getLAngleLoc()),
                                        ToParams,
-                                       Importer.Import(Params->getRAngleLoc()));
+                                       Importer.Import(Params->getRAngleLoc()),
+                                       ToRequiresClause);
 }
 
 TemplateArgument