dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ObjC][Modules] Don't perform property lookup in hidden class extensions 

rdar://30603803


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@295903 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alex Lorenz 2017-02-22 23:18:49 +00:00
parent 7704715f8c
commit b10bb3222f
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/DeclObjC.cpp
View File

@ -162,10 +162,10 @@ ObjCPropertyDecl::findPropertyDecl(const DeclContext *DC,
return nullptr;
}
// If context is class, then lookup property in its extensions.
// If context is class, then lookup property in its visible extensions.
// This comes before property is looked up in primary class.
if (auto *IDecl = dyn_cast<ObjCInterfaceDecl>(DC)) {
for (const auto *Ext : IDecl->known_extensions())
for (const auto *Ext : IDecl->visible_extensions())
if (ObjCPropertyDecl *PD = ObjCPropertyDecl::findPropertyDecl(Ext,
propertyID,
queryKind))

5
test/Modules/Inputs/category_right_sub.h
View File

@ -15,3 +15,8 @@
@interface Foo(LeftP4) <P4>
@end
// A hidden extension
@interface Foo ()
@property (assign) int hiddenPropertyFromExtension;
@end

6
test/Modules/objc-categories.m
View File

@ -53,6 +53,9 @@ void test_hidden_all_errors(Foo *foo) {
p3p = foo.p3_prop; // expected-error{{property 'p3_prop' not found on object of type 'Foo *'}}
id p4p = p4.p4_prop; // expected-error{{property 'p4_prop' not found on object of type 'id<P4>'}}
p4p = foo.p4_prop; // expected-error{{property 'p4_prop' not found on object of type 'Foo *'}}
if (foo.hiddenPropertyFromExtension) { // expected-error {{property 'hiddenPropertyFromExtension' not found on object of type 'Foo *'}}
}
}
@import category_left.sub;
@ -74,6 +77,7 @@ void test_hidden_right_errors(Foo *foo) {
id p4p = p4.p4_prop; // expected-error{{property 'p4_prop' not found on object of type 'id<P4>'}}
p4p = foo.p4_prop; // expected-error{{property 'p4_prop' not found on object of type 'Foo *'; did you mean 'p3_prop'?}}
// expected-note@Inputs/category_left_sub.h:7{{'p3_prop' declared here}}
int hiddenFromExtension = foo.hiddenPropertyFromExtension; // expected-error {{property 'hiddenPropertyFromExtension' not found on object of type 'Foo *'}}
}
@import category_right.sub;
@ -92,4 +96,6 @@ void test_hidden_okay(Foo *foo) {
p3p = foo.p3_prop;
id p4p = p4.p4_prop;
p4p = foo.p4_prop;
if (foo.hiddenPropertyFromExtension) {
}
}