commit 43ccec8e5314dcd7091e47a98ae08ef86c154697
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Aug 26 03:52:16 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Aug 26 03:52:16 2014 +0000
tree b590c2a2317bb4288fdf08ee239d7018bb5a492d
parent 4af4d2c111e5f8eaf5b49b64fd380dbea5d36f19

[modules] Track the described template in an alias declaration that is the
pattern of an alias template declaration. Use this to merge alias templates
properly when they're members of class template specializations.

llvm-svn: 216437

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 6a48162..82d06d1 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -8207,6 +8207,7 @@
       TypeAliasTemplateDecl::Create(Context, CurContext, UsingLoc,
                                     Name.Identifier, TemplateParams,
                                     NewTD);
+    NewTD->setDescribedAliasTemplate(NewDecl);
 
     NewDecl->setAccess(AS);