diff options
| -rw-r--r-- | lib/Sema/ScopeInfo.cpp | 2 | ||||
| -rw-r--r-- | test/SemaObjC/arc-repeated-weak.mm | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/Sema/ScopeInfo.cpp b/lib/Sema/ScopeInfo.cpp index c1d6629905..4d29a34a73 100644 --- a/lib/Sema/ScopeInfo.cpp +++ b/lib/Sema/ScopeInfo.cpp @@ -159,7 +159,7 @@ void FunctionScopeInfo::markSafeWeakUse(const Expr *E) { Uses = WeakObjectUses.find(WeakObjectProfileTy(IvarE)); else if (const DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(E)) Uses = WeakObjectUses.find(WeakObjectProfileTy(DRE)); - else if (const ObjCMessageExpr *MsgE = dyn_cast<ObjCMessageExpr>(MsgE)) { + else if (const ObjCMessageExpr *MsgE = dyn_cast<ObjCMessageExpr>(E)) { Uses = WeakObjectUses.end(); if (const ObjCMethodDecl *MD = MsgE->getMethodDecl()) { if (const ObjCPropertyDecl *Prop = MD->findPropertyDecl()) { diff --git a/test/SemaObjC/arc-repeated-weak.mm b/test/SemaObjC/arc-repeated-weak.mm index a59f435693..1539a9bcae 100644 --- a/test/SemaObjC/arc-repeated-weak.mm +++ b/test/SemaObjC/arc-repeated-weak.mm @@ -181,6 +181,18 @@ void assignToStrongWithCasts(Test *a) { } } +void assignToStrongWithMessages(Test *a) { + if (condition()) { + id val = [a weakProp]; // no-warning + (void)val; + } else { + id val; + val = [a weakProp]; // no-warning + (void)val; + } +} + + void assignAfterRead(Test *a) { // Special exception for a single read before any writes. if (!a.weakProp) // no-warning |