diff options
author | Fariborz Jahanian <fjahanian@apple.com> | 2014-06-26 21:22:16 +0000 |
---|---|---|
committer | Fariborz Jahanian <fjahanian@apple.com> | 2014-06-26 21:22:16 +0000 |
commit | 1b9b13db0cf578d25a48d243e96ee78ebb6ea18e (patch) | |
tree | 51635cc7c1f59767603807aa7f2ae477836a9d5e /lib | |
parent | b408a524097296e13380620ebf414cc9fa389fc7 (diff) | |
download | clang-1b9b13db0cf578d25a48d243e96ee78ebb6ea18e.tar.gz clang-1b9b13db0cf578d25a48d243e96ee78ebb6ea18e.tar.bz2 clang-1b9b13db0cf578d25a48d243e96ee78ebb6ea18e.tar.xz |
Objective-C ARC. Provide diagnostic and fix-it
when casting a retainable object to a objc_bridge_related
CF type with the suggestion of applying the method
specified in the bridging attribute to the object.
// rdar://15932435
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211807 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Sema/SemaExpr.cpp | 4 | ||||
-rw-r--r-- | lib/Sema/SemaExprObjC.cpp | 23 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 8153dff497..2f1d1a6172 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -5274,7 +5274,9 @@ Sema::ActOnCastExpr(Scope *S, SourceLocation LParenLoc, Diag(LParenLoc, diag::warn_old_style_cast) << CastExpr->getSourceRange(); CheckTollFreeBridgeCast(castType, CastExpr); - + + CheckObjCBridgeRelatedCast(castType, CastExpr); + return BuildCStyleCastExpr(LParenLoc, castTInfo, RParenLoc, CastExpr); } diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp index 299dd5d379..0cae6bf3f7 100644 --- a/lib/Sema/SemaExprObjC.cpp +++ b/lib/Sema/SemaExprObjC.cpp @@ -3460,6 +3460,29 @@ void Sema::CheckTollFreeBridgeCast(QualType castType, Expr *castExpr) { } } +void Sema::CheckObjCBridgeRelatedCast(QualType castType, Expr *castExpr) { + QualType SrcType = castExpr->getType(); + if (ObjCPropertyRefExpr *PRE = dyn_cast<ObjCPropertyRefExpr>(castExpr)) { + if (PRE->isExplicitProperty()) { + if (ObjCPropertyDecl *PDecl = PRE->getExplicitProperty()) + SrcType = PDecl->getType(); + } + else if (PRE->isImplicitProperty()) { + if (ObjCMethodDecl *Getter = PRE->getImplicitPropertyGetter()) + SrcType = Getter->getReturnType(); + + } + } + + ARCConversionTypeClass srcExprACTC = classifyTypeForARCConversion(SrcType); + ARCConversionTypeClass castExprACTC = classifyTypeForARCConversion(castType); + if (srcExprACTC != ACTC_retainable || castExprACTC != ACTC_coreFoundation) + return; + CheckObjCBridgeRelatedConversions(castExpr->getLocStart(), + castType, SrcType, castExpr); + return; +} + bool Sema::CheckTollFreeBridgeStaticCast(QualType castType, Expr *castExpr, CastKind &Kind) { if (!getLangOpts().ObjC1) |