maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

objective-C arc: Diagnostic can not say to use bridge 

casts with c++ named casts. Change notes to say use
bridge with c-style cast instead. // rdar://12788838

llvm-svn: 175850
This commit is contained in:
Fariborz Jahanian 2013-02-22 01:22:48 +00:00
parent 57ecf603c4
commit ac2d082f58
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -3854,12 +3854,20 @@ def err_arc_cast_requires_bridge : Error<
"requires a bridged cast">; "requires a bridged cast">;
def note_arc_bridge : Note< def note_arc_bridge : Note<
"use __bridge to convert directly (no change in ownership)">; "use __bridge to convert directly (no change in ownership)">;
def note_arc_cstyle_bridge : Note<
"use __bridge with C-style cast to convert directly (no change in ownership)">;
def note_arc_bridge_transfer : Note< def note_arc_bridge_transfer : Note<
"use %select{__bridge_transfer|CFBridgingRelease call}1 to transfer " "use %select{__bridge_transfer|CFBridgingRelease call}1 to transfer "
"ownership of a +1 %0 into ARC">; "ownership of a +1 %0 into ARC">;
def note_arc_cstyle_bridge_transfer : Note<
"use __bridge_transfer with C-style cast to transfer "
"ownership of a +1 %0 into ARC">;
def note_arc_bridge_retained : Note< def note_arc_bridge_retained : Note<
"use %select{__bridge_retained|CFBridgingRetain call}1 to make an " "use %select{__bridge_retained|CFBridgingRetain call}1 to make an "
"ARC object available as a +1 %0">; "ARC object available as a +1 %0">;
def note_arc_cstyle_bridge_retained : Note<
"use __bridge_retained with C-style cast to make an "
"ARC object available as a +1 %0">;
} // ARC Casting category } // ARC Casting category

21
clang/lib/Sema/SemaExprObjC.cpp
View File

@ -2925,15 +2925,22 @@ diagnoseObjCARCConversion(Sema &S, SourceRange castRange,
assert(CreateRule != ACC_bottom && "This cast should already be accepted."); assert(CreateRule != ACC_bottom && "This cast should already be accepted.");
if (CreateRule != ACC_plusOne) if (CreateRule != ACC_plusOne)
{ {
DiagnosticBuilder DiagB = S.Diag(noteLoc, diag::note_arc_bridge); DiagnosticBuilder DiagB =
(CCK != Sema::CCK_OtherCast) ? S.Diag(noteLoc, diag::note_arc_bridge)
: S.Diag(noteLoc, diag::note_arc_cstyle_bridge);
addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen, addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen,
castType, castExpr, "__bridge ", 0); castType, castExpr, "__bridge ", 0);
} }
if (CreateRule != ACC_plusZero) if (CreateRule != ACC_plusZero)
{ {
DiagnosticBuilder DiagB = S.Diag(br ? castExpr->getExprLoc() : noteLoc, DiagnosticBuilder DiagB =
(CCK == Sema::CCK_OtherCast && !br) ?
S.Diag(noteLoc, diag::note_arc_cstyle_bridge_transfer) << castExprType :
S.Diag(br ? castExpr->getExprLoc() : noteLoc,
diag::note_arc_bridge_transfer) diag::note_arc_bridge_transfer)
<< castExprType << br; << castExprType << br;
addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen, addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen,
castType, castExpr, "__bridge_transfer ", castType, castExpr, "__bridge_transfer ",
br ? "CFBridgingRelease" : 0); br ? "CFBridgingRelease" : 0);
@ -2958,15 +2965,21 @@ diagnoseObjCARCConversion(Sema &S, SourceRange castRange,
assert(CreateRule != ACC_bottom && "This cast should already be accepted."); assert(CreateRule != ACC_bottom && "This cast should already be accepted.");
if (CreateRule != ACC_plusOne) if (CreateRule != ACC_plusOne)
{ {
DiagnosticBuilder DiagB = S.Diag(noteLoc, diag::note_arc_bridge); DiagnosticBuilder DiagB =
(CCK != Sema::CCK_OtherCast) ? S.Diag(noteLoc, diag::note_arc_bridge)
: S.Diag(noteLoc, diag::note_arc_cstyle_bridge);
addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen, addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen,
castType, castExpr, "__bridge ", 0); castType, castExpr, "__bridge ", 0);
} }
if (CreateRule != ACC_plusZero) if (CreateRule != ACC_plusZero)
{ {
DiagnosticBuilder DiagB = S.Diag(br ? castExpr->getExprLoc() : noteLoc, DiagnosticBuilder DiagB =
(CCK == Sema::CCK_OtherCast && !br) ?
S.Diag(noteLoc, diag::note_arc_cstyle_bridge_retained) << castType :
S.Diag(br ? castExpr->getExprLoc() : noteLoc,
diag::note_arc_bridge_retained) diag::note_arc_bridge_retained)
<< castType << br; << castType << br;
addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen, addFixitForObjCARCConversion(S, DiagB, CCK, afterLParen,
castType, castExpr, "__bridge_retained ", castType, castExpr, "__bridge_retained ",
br ? "CFBridgingRetain" : 0); br ? "CFBridgingRetain" : 0);

9
clang/test/SemaObjCXX/arc-unbridged-cast.mm
View File

@ -108,3 +108,12 @@ void testTakerFunctions(id string) {
takeCFVariadicAudited(1, (CFStringRef) string); takeCFVariadicAudited(1, (CFStringRef) string);
takeCFConsumedAudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgingRetain call to}} takeCFConsumedAudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgingRetain call to}}
} }
// rdar://12788838
id obj;
void rdar12788838() {
void *foo = reinterpret_cast<void *>(obj); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'void *' requires a bridged cast}} \
// expected-note {{use __bridge with C-style cast to convert directly}} \
// expected-note {{use CFBridgingRetain call to make an ARC object available as a +1 'void *'}}
}