commit 4a4010ee517a28989287989f8e68921bee33f7c3
author Eli Friedman <eli.friedman@gmail.com> Sun Aug 30 00:53:54 2009 +0000
committer Eli Friedman <eli.friedman@gmail.com> Sun Aug 30 00:53:54 2009 +0000
tree a217fc3db0c72a50e294fb1a3724192f293ea912
parent b0122d35342da4971618e8f9cd713d6ccd5d7b5d

Unbreak tests.  I'll look into why this is necessary later.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80468 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 9785fb2..aa116b2 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1137,6 +1137,7 @@
       QualType BaseType(Init->getBaseClass(), 0);
       BaseType = SubstType(BaseType, TemplateArgs, Init->getSourceLocation(),
                            New->getDeclName());
+      BaseType = Context.getCanonicalType(BaseType);
 
       NewInit = BuildBaseInitializer(BaseType,
                                      (Expr **)NewArgs.data(),