diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-03-18 21:02:14 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-03-18 21:02:14 +0000 |
commit | 771ed34680836f96111061f631c7c95714ba41dc (patch) | |
tree | 23a182e08af2e4f842dba693bb2802ee0c4ac9b0 | |
parent | f2daf531762bb788d7ad5c1ecc5d004d3dd48da1 (diff) | |
download | clang-771ed34680836f96111061f631c7c95714ba41dc.tar.gz clang-771ed34680836f96111061f631c7c95714ba41dc.tar.bz2 clang-771ed34680836f96111061f631c7c95714ba41dc.tar.xz |
Simplify and add FIXME. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@204181 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/AST/DeclTemplate.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/clang/AST/DeclTemplate.h b/include/clang/AST/DeclTemplate.h index 8e017e6127..d55582a161 100644 --- a/include/clang/AST/DeclTemplate.h +++ b/include/clang/AST/DeclTemplate.h @@ -1452,6 +1452,11 @@ public: void getNameForDiagnostic(raw_ostream &OS, const PrintingPolicy &Policy, bool Qualified) const override; + // FIXME: This is broken. CXXRecordDecl::getMostRecentDecl() returns a + // different "most recent" declaration from this function for the same + // declaration, because we don't override getMostRecentDeclImpl(). But + // it's not clear that we should override that, because the most recent + // declaration as a CXXRecordDecl sometimes is the injected-class-name. ClassTemplateSpecializationDecl *getMostRecentDecl() { CXXRecordDecl *Recent = static_cast<CXXRecordDecl *>( this)->getMostRecentDecl(); @@ -1520,17 +1525,11 @@ public: llvm::PointerUnion<ClassTemplateDecl *, ClassTemplatePartialSpecializationDecl *> getInstantiatedFrom() const { - if (getSpecializationKind() != TSK_ImplicitInstantiation && - getSpecializationKind() != TSK_ExplicitInstantiationDefinition && - getSpecializationKind() != TSK_ExplicitInstantiationDeclaration) + if (!isTemplateInstantiation(getSpecializationKind())) return llvm::PointerUnion<ClassTemplateDecl *, ClassTemplatePartialSpecializationDecl *>(); - if (SpecializedPartialSpecialization *PartialSpec - = SpecializedTemplate.dyn_cast<SpecializedPartialSpecialization*>()) - return PartialSpec->PartialSpecialization; - - return SpecializedTemplate.get<ClassTemplateDecl*>(); + return getSpecializedTemplateOrPartial(); } /// \brief Retrieve the class template or class template partial |