diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-12-20 19:22:21 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-12-20 19:22:21 +0000 |
| commit | ad017fa7a4df7389d245d02a49b3c79ed70bedb9 (patch) | |
| tree | bcbd290037266bae92bfb10705c40e830ea71a07 /lib/Sema/SemaChecking.cpp | |
| parent | a367a0236211dd2c81a363c4b47b40e0ac6a8797 (diff) | |
Revert r170500. It over-zealously converted *ALL* things named Attributes, which is wrong here.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170721 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaChecking.cpp')
| -rw-r--r-- | lib/Sema/SemaChecking.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index 6cb8659d90..095d25aa02 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -5806,8 +5806,8 @@ void Sema::checkUnsafeExprAssigns(SourceLocation Loc, if (!PD) return; - unsigned Attribute = PD->getPropertyAttributes(); - if (Attribute & ObjCPropertyDecl::OBJC_PR_assign) { + unsigned Attributes = PD->getPropertyAttributes(); + if (Attributes & ObjCPropertyDecl::OBJC_PR_assign) { // when 'assign' attribute was not explicitly specified // by user, ignore it and rely on property type itself // for lifetime info. @@ -5825,7 +5825,7 @@ void Sema::checkUnsafeExprAssigns(SourceLocation Loc, RHS = cast->getSubExpr(); } } - else if (Attribute & ObjCPropertyDecl::OBJC_PR_weak) { + else if (Attributes & ObjCPropertyDecl::OBJC_PR_weak) { while (ImplicitCastExpr *cast = dyn_cast<ImplicitCastExpr>(RHS)) { if (cast->getCastKind() == CK_ARCConsumeObject) { Diag(Loc, diag::warn_arc_retained_assign) |