From 8d2dbbf9ddfd9d762a341d83f83d840ff68ce03d Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 16 Dec 2011 16:34:57 +0000 Subject: [PATCH] If there is a definition of an ObjCInterfaceDecl, make it the Decl returned from the corresponding ObjCInterfaceType git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146740 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/Type.h | 3 ++- lib/AST/ASTContext.cpp | 4 ++++ lib/AST/DeclObjC.cpp | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h index c9bee817a8..de5839688d 100644 --- a/include/clang/AST/Type.h +++ b/include/clang/AST/Type.h @@ -4139,12 +4139,13 @@ inline ObjCProtocolDecl **ObjCObjectType::getProtocolStorage() { /// - It is its own base type. That is, if T is an ObjCInterfaceType*, /// T->getBaseType() == QualType(T, 0). class ObjCInterfaceType : public ObjCObjectType { - ObjCInterfaceDecl *Decl; + mutable ObjCInterfaceDecl *Decl; ObjCInterfaceType(const ObjCInterfaceDecl *D) : ObjCObjectType(Nonce_ObjCInterface), Decl(const_cast(D)) {} friend class ASTContext; // ASTContext creates these. + friend class ObjCInterfaceDecl; public: /// getDecl - Get the declaration of this interface. diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index de0250ced4..9784191ad8 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -2819,6 +2819,10 @@ QualType ASTContext::getObjCInterfaceType(const ObjCInterfaceDecl *Decl, return QualType(PrevDecl->TypeForDecl, 0); } + // Prefer the definition, if there is one. + if (const ObjCInterfaceDecl *Def = Decl->getDefinition()) + Decl = Def; + void *Mem = Allocate(sizeof(ObjCInterfaceType), TypeAlignment); ObjCInterfaceType *T = new (Mem) ObjCInterfaceType(Decl); Decl->TypeForDecl = T; diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp index 317dc95f54..02cc988d82 100644 --- a/lib/AST/DeclObjC.cpp +++ b/lib/AST/DeclObjC.cpp @@ -225,7 +225,11 @@ void ObjCInterfaceDecl::mergeClassExtensionProtocolList( void ObjCInterfaceDecl::allocateDefinitionData() { assert(!hasDefinition() && "ObjC class already has a definition"); Data = new (getASTContext()) DefinitionData(); - Data->Definition = this; + Data->Definition = this; + + // Make the type point at the definition, now that we have one. + if (TypeForDecl) + cast(TypeForDecl)->Decl = this; } void ObjCInterfaceDecl::startDefinition() { -- 2.40.0