From 3c50f2544f7a8f0c41f4fc286064abce2d3629b5 Mon Sep 17 00:00:00 2001 From: Artem Dergachev Date: Wed, 4 Dec 2019 16:26:16 -0800 Subject: [analyzer] Fix more ObjC accessor body farms after 2073dd2d. Fix a crash when constructing a body farm for accessors of a property that is declared and @synthesize'd in different (but related) interfaces with the explicit ivar syntax. This is a follow-up for 0b58b80e. --- clang/lib/Analysis/BodyFarm.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'clang/lib/Analysis/BodyFarm.cpp') diff --git a/clang/lib/Analysis/BodyFarm.cpp b/clang/lib/Analysis/BodyFarm.cpp index 694913b3ac9..1a789155054 100644 --- a/clang/lib/Analysis/BodyFarm.cpp +++ b/clang/lib/Analysis/BodyFarm.cpp @@ -741,13 +741,17 @@ static Stmt *createObjCPropertyGetter(ASTContext &Ctx, // First, find the backing ivar. const ObjCIvarDecl *IVar = nullptr; - // Property accessor stubs sometimes do not correspond to any property. + // Property accessor stubs sometimes do not correspond to any property decl + // in the current interface (but in a superclass). They still have a + // corresponding property impl decl in this case. if (MD->isSynthesizedAccessorStub()) { const ObjCInterfaceDecl *IntD = MD->getClassInterface(); const ObjCImplementationDecl *ImpD = IntD->getImplementation(); - for (const auto *V: ImpD->ivars()) { - if (V->getName() == MD->getSelector().getNameForSlot(0)) - IVar = V; + for (const auto *PI: ImpD->property_impls()) { + if (const ObjCPropertyDecl *P = PI->getPropertyDecl()) { + if (P->getGetterName() == MD->getSelector()) + IVar = P->getPropertyIvarDecl(); + } } } -- cgit v1.2.3