maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Sema: use PropertyDecl for property selector 

Using the constructed name for the class properties with dot syntax may
yield an inappropriate selector (i.e. if it is specified via property
attributes).  Prefer the declaration for the selector, falling back to
the constructed name otherwise.

Patch by David Herzka!

llvm-svn: 295683
This commit is contained in:
Saleem Abdulrasool 2017-02-20 23:45:49 +00:00
parent e8beaff021
commit b3a2d04edd
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clang/lib/Sema/SemaExprObjC.cpp
View File

@ -1984,13 +1984,24 @@ ActOnClassPropertyRefExpr(IdentifierInfo &receiverName,
}
}
Selector GetterSel;
Selector SetterSel;
if (auto PD = IFace->FindPropertyDeclaration(
&propertyName, ObjCPropertyQueryKind::OBJC_PR_query_class)) {
GetterSel = PD->getGetterName();
SetterSel = PD->getSetterName();
} else {
GetterSel = PP.getSelectorTable().getNullarySelector(&propertyName);
SetterSel = SelectorTable::constructSetterSelector(
PP.getIdentifierTable(), PP.getSelectorTable(), &propertyName);
}
// Search for a declared property first.
Selector Sel = PP.getSelectorTable().getNullarySelector(&propertyName);
ObjCMethodDecl *Getter = IFace->lookupClassMethod(Sel);
ObjCMethodDecl *Getter = IFace->lookupClassMethod(GetterSel);
// If this reference is in an @implementation, check for 'private' methods.
if (!Getter)
Getter = IFace->lookupPrivateClassMethod(Sel);
Getter = IFace->lookupPrivateClassMethod(GetterSel);
if (Getter) {
// FIXME: refactor/share with ActOnMemberReference().
@ -2000,11 +2011,6 @@ ActOnClassPropertyRefExpr(IdentifierInfo &receiverName,
}
// Look for the matching setter, in case it is needed.
Selector SetterSel =
SelectorTable::constructSetterSelector(PP.getIdentifierTable(),
PP.getSelectorTable(),
&propertyName);
ObjCMethodDecl *Setter = IFace->lookupClassMethod(SetterSel);
if (!Setter) {
// If this reference is in an @implementation, also check for 'private'

9
clang/test/SemaObjC/objc-class-property.m
View File

@ -21,6 +21,8 @@
@property (class) int c2; // expected-note {{property declared here}} \
// expected-note {{property declared here}}
@property (class) int x;
@property (class, setter=customSet:) int customSetterProperty;
@property (class, getter=customGet) int customGetterProperty;
@end
@implementation A // expected-warning {{class property 'c2' requires method 'c2' to be defined}} \
@ -29,6 +31,8 @@
@dynamic (class) x; // refers to the class property
@synthesize z, c2; // expected-error {{@synthesize not allowed on a class property 'c2'}}
@dynamic c; // refers to the class property
@dynamic customSetterProperty;
@dynamic customGetterProperty;
@end
int test() {
@ -37,6 +41,11 @@ int test() {
return a.x + A.c;
}
void customSelectors() {
A.customSetterProperty = 1;
(void)A.customGetterProperty;
}
void message_id(id me) {
[me y];
}