summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/DeclObjC.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-01-07 19:21:03 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-01-07 19:21:03 +0000
commitc41cf0598f076f8f6cd2223c739592a91fe78717 (patch)
tree43bee48748627ae5dabf535eebcd4aeb068fde35 /clang/lib/AST/DeclObjC.cpp
parent68d31ce5ff33c987104431efa45c30cfe53df27f (diff)
downloadbcm5719-llvm-c41cf0598f076f8f6cd2223c739592a91fe78717.tar.gz
bcm5719-llvm-c41cf0598f076f8f6cd2223c739592a91fe78717.zip
objective-C: when searching for declarations in protocol
list of classes, etc., make sure to look into protocol definitions. // rdar://12958878 llvm-svn: 171777
Diffstat (limited to 'clang/lib/AST/DeclObjC.cpp')
-rw-r--r--clang/lib/AST/DeclObjC.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp
index 12e5d8c3042..62b4f5ea82c 100644
--- a/clang/lib/AST/DeclObjC.cpp
+++ b/clang/lib/AST/DeclObjC.cpp
@@ -1352,15 +1352,19 @@ void ObjCProtocolDecl::startDefinition() {
}
void ObjCProtocolDecl::collectPropertiesToImplement(PropertyMap &PM) const {
- for (ObjCProtocolDecl::prop_iterator P = prop_begin(),
- E = prop_end(); P != E; ++P) {
+ const ObjCProtocolDecl *PDecl = this;
+ if (!isThisDeclarationADefinition() && getDefinition())
+ PDecl = getDefinition();
+
+ for (ObjCProtocolDecl::prop_iterator P = PDecl->prop_begin(),
+ E = PDecl->prop_end(); P != E; ++P) {
ObjCPropertyDecl *Prop = *P;
// Insert into PM if not there already.
PM.insert(std::make_pair(Prop->getIdentifier(), Prop));
}
// Scan through protocol's protocols.
- for (ObjCProtocolDecl::protocol_iterator PI = protocol_begin(),
- E = protocol_end(); PI != E; ++PI)
+ for (ObjCProtocolDecl::protocol_iterator PI = PDecl->protocol_begin(),
+ E = PDecl->protocol_end(); PI != E; ++PI)
(*PI)->collectPropertiesToImplement(PM);
}
OpenPOWER on IntegriCloud