maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 73284
This commit is contained in:
Anders Carlsson 2009-06-13 02:59:33 +00:00
parent 64e6529e76
commit 20ee0ed4ea
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/AST/DeclCXX.cpp
View File

@ -260,7 +260,12 @@ QualType CXXMethodDecl::getThisType(ASTContext &C) const {
// 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();
}

8
clang/test/SemaTemplate/instantiate-function-1.cpp
View File

@ -140,7 +140,7 @@ template<typename T> struct Member0 {
tp->f;
this->f;
this.f; // expected-error{{member reference base type 'struct Member0 *const' is not a structure or union}}
this.f; // expected-error{{member reference base type 'Member0<T> *const' is not a structure or union}}
}
};
@ -209,3 +209,9 @@ struct Abstract {
template struct TryCatch0<int>; // okay
template struct TryCatch0<Incomplete*>; // expected-note{{instantiation}}
template struct TryCatch0<Abstract>; // expected-note{{instantiation}}
// PR4383
template<typename T> struct X;
template<typename T> struct Y : public X<T> {
Y& x() { return *this; }
};