commit 20ee0ed4eaefbf7dba08385137240682e81742e7
author Anders Carlsson <andersca@mac.com> Sat Jun 13 02:59:33 2009 +0000
committer Anders Carlsson <andersca@mac.com> Sat Jun 13 02:59:33 2009 +0000
tree 2bf8728bdd4fc08150b51acb6a7f3922aef60633
parent 64e6529e76e33fef1447a0bb6a8e53469eaf4a9e

If a CXXRecordDecl is a class template, the 'this' type should be the injected class name type. Fixes pr4383.

llvm-svn: 73284

clang/lib/AST/DeclCXX.cpp

diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
index 94daf48..8430da2 100644
--- a/clang/lib/AST/DeclCXX.cpp
+++ b/clang/lib/AST/DeclCXX.cpp
@@ -260,7 +260,12 @@
   // the type of this is const volatile X*.
 
   assert(isInstance() && "No 'this' for static methods!");
-  QualType ClassTy = C.getTagDeclType(const_cast<CXXRecordDecl*>(getParent()));
+
+  QualType ClassTy;
+  if (ClassTemplateDecl *TD = getParent()->getDescribedClassTemplate())
+    ClassTy = TD->getInjectedClassNameType(C);
+  else
+    ClassTy = C.getTagDeclType(const_cast<CXXRecordDecl*>(getParent()));
   ClassTy = ClassTy.getWithAdditionalQualifiers(getTypeQualifiers());
   return C.getPointerType(ClassTy).withConst();
 }