summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaCast.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2014-05-10 17:40:11 +0000
committerFariborz Jahanian <fjahanian@apple.com>2014-05-10 17:40:11 +0000
commitc70a54366e88bbea63ddde3805f870f837673a7f (patch)
treef11846dfa1796bbcb116981e1dad16663fe0cd4a /clang/lib/Sema/SemaCast.cpp
parente6f743f9ab2c50b1a1a250e1a15b1ae4d3d317ad (diff)
downloadbcm5719-llvm-c70a54366e88bbea63ddde3805f870f837673a7f.tar.gz
bcm5719-llvm-c70a54366e88bbea63ddde3805f870f837673a7f.zip
Objective-C ARC. Add support for toll-free bridge
type ,and bridge attribute, checking with static_cast. // rdar://16756639 llvm-svn: 208474
Diffstat (limited to 'clang/lib/Sema/SemaCast.cpp')
-rw-r--r--clang/lib/Sema/SemaCast.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaCast.cpp b/clang/lib/Sema/SemaCast.cpp
index 51a339581d8..b842ce8889d 100644
--- a/clang/lib/Sema/SemaCast.cpp
+++ b/clang/lib/Sema/SemaCast.cpp
@@ -1067,6 +1067,11 @@ static TryCastResult TryStaticCast(Sema &Self, ExprResult &SrcExpr,
Kind = CK_BitCast;
return TC_Success;
}
+ // Allow ns-pointer to cf-pointer conversion in either direction
+ // with static casts.
+ if (!CStyle &&
+ Self.CheckTollFreeBridgeStaticCast(DestType, SrcExpr.get(), Kind))
+ return TC_Success;
// We tried everything. Everything! Nothing works! :-(
return TC_NotApplicable;
OpenPOWER on IntegriCloud