aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaExprObjC.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-07-28 00:11:31 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-07-28 00:11:31 +0000
commitd9c729e67916cd8b1638ff72270dad98d1a02a58 (patch)
tree75bf1b528e76928dff01531b4c200d5d2a879db7 /lib/Sema/SemaExprObjC.cpp
parent24b2ab7b5939a7298b040216dcd93c838f42d8d0 (diff)
more objc-arc: With ACC_bottom, we just provide
__bride fixit, as it doesn't matter which cast to use. // rdar://11923822 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160906 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaExprObjC.cpp')
-rw-r--r--lib/Sema/SemaExprObjC.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index 20c8e884be..dc15f2641d 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -2868,7 +2868,7 @@ diagnoseObjCARCConversion(Sema &S, SourceRange castRange,
addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen,
castType, castExpr, "__bridge ", 0);
}
- if (CreateRule != ACC_plusZero)
+ if (CreateRule != ACC_plusZero && CreateRule != ACC_bottom)
{
DiagnosticBuilder DiagB = S.Diag(br ? castExpr->getExprLoc() : noteLoc,
diag::note_arc_bridge_transfer)
@@ -2900,7 +2900,7 @@ diagnoseObjCARCConversion(Sema &S, SourceRange castRange,
addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen,
castType, castExpr, "__bridge ", 0);
}
- if (CreateRule != ACC_plusZero)
+ if (CreateRule != ACC_plusZero && CreateRule != ACC_bottom)
{
DiagnosticBuilder DiagB = S.Diag(br ? castExpr->getExprLoc() : noteLoc,
diag::note_arc_bridge_retained)