diff options
| -rw-r--r-- | lib/Sema/SemaPseudoObject.cpp | 9 | ||||
| -rw-r--r-- | test/SemaObjC/property.m | 9 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/Sema/SemaPseudoObject.cpp b/lib/Sema/SemaPseudoObject.cpp index b3ed145b15..cf43fcad05 100644 --- a/lib/Sema/SemaPseudoObject.cpp +++ b/lib/Sema/SemaPseudoObject.cpp @@ -418,7 +418,14 @@ static ObjCMethodDecl *LookupMethodInReceiverType(Sema &S, Selector sel, bool ObjCPropertyOpBuilder::findGetter() { if (Getter) return true; - Getter = LookupMethodInReceiverType(S, RefExpr->getGetterSelector(), RefExpr); + // For implicit properties, just trust the lookup we already did. + if (RefExpr->isImplicitProperty()) { + Getter = RefExpr->getImplicitPropertyGetter(); + return (Getter != 0); + } + + ObjCPropertyDecl *prop = RefExpr->getExplicitProperty(); + Getter = LookupMethodInReceiverType(S, prop->getGetterName(), RefExpr); return (Getter != 0); } diff --git a/test/SemaObjC/property.m b/test/SemaObjC/property.m index 7d1cb7a361..a43811d824 100644 --- a/test/SemaObjC/property.m +++ b/test/SemaObjC/property.m @@ -65,3 +65,12 @@ typedef id BYObjectIdentifier; // rdar://10127639 @synthesize window; // expected-error {{missing context for property implementation declaration}} + +// rdar://10408414 +Class test6_getClass(); +@interface Test6 +@end +@implementation Test6 ++ (float) globalValue { return 5.0f; } ++ (float) gv { return test6_getClass().globalValue; } +@end |