replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ObjectiveC migrator: make sure audited pragams are 

dumped for last declarations in the current TU. wip.

llvm-svn: 188838
This commit is contained in:
Fariborz Jahanian 2013-08-20 22:42:13 +00:00
parent 22ce34aee8
commit 301b52145f
3 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
clang/lib/ARCMigrate/ObjCMT.cpp
View File

@ -52,6 +52,8 @@ class ObjCMigrateASTConsumer : public ASTConsumer {
void migrateCFFunctions(ASTContext &Ctx,
const FunctionDecl *FuncDecl);
void AnnotateImplicitBridging(ASTContext &Ctx);
bool migrateAddFunctionAnnotation(ASTContext &Ctx,
const FunctionDecl *FuncDecl);
@ -794,9 +796,39 @@ AuditedType (QualType AT, bool &IsPoniter) {
return true;
}
void ObjCMigrateASTConsumer::AnnotateImplicitBridging(ASTContext &Ctx) {
if (!Ctx.Idents.get("CF_IMPLICIT_BRIDGING_ENABLED").hasMacroDefinition()) {
CFFunctionIBCandidates.clear();
return;
}
// Insert CF_IMPLICIT_BRIDGING_ENABLE/CF_IMPLICIT_BRIDGING_DISABLED
const FunctionDecl *FirstFD = CFFunctionIBCandidates[0];
const FunctionDecl *LastFD =
CFFunctionIBCandidates[CFFunctionIBCandidates.size()-1];
const char *PragmaString = "\nCF_IMPLICIT_BRIDGING_ENABLED\n\n";
edit::Commit commit(*Editor);
commit.insertBefore(FirstFD->getLocStart(), PragmaString);
PragmaString = "\n\nCF_IMPLICIT_BRIDGING_DISABLED\n";
SourceLocation EndLoc = LastFD->getLocEnd();
// get location just past end of function location.
EndLoc = PP.getLocForEndOfToken(EndLoc);
Token Tok;
// get locaiton of token that comes after end of function.
bool Failed = PP.getRawToken(EndLoc, Tok, /*IgnoreWhiteSpace=*/true);
if (!Failed)
EndLoc = Tok.getLocation();
commit.insertAfterToken(EndLoc, PragmaString);
Editor->commit(commit);
CFFunctionIBCandidates.clear();
}
void ObjCMigrateASTConsumer::migrateCFFunctions(
ASTContext &Ctx,
const FunctionDecl *FuncDecl) {
// FileID FID = PP.getSourceManager().getFileID(FuncDecl->getLocation());
if (FuncDecl->hasAttr<CFAuditedTransferAttr>()) {
assert(CFFunctionIBCandidates.empty() &&
"Cannot have audited functions inside user "
@ -808,34 +840,8 @@ void ObjCMigrateASTConsumer::migrateCFFunctions(
bool Audited = migrateAddFunctionAnnotation(Ctx, FuncDecl);
if (Audited)
CFFunctionIBCandidates.push_back(FuncDecl);
else if (!CFFunctionIBCandidates.empty()) {
if (!Ctx.Idents.get("CF_IMPLICIT_BRIDGING_ENABLED").hasMacroDefinition()) {
CFFunctionIBCandidates.clear();
return;
}
// Insert CF_IMPLICIT_BRIDGING_ENABLE/CF_IMPLICIT_BRIDGING_DISABLED
const FunctionDecl *FirstFD = CFFunctionIBCandidates[0];
const FunctionDecl *LastFD =
CFFunctionIBCandidates[CFFunctionIBCandidates.size()-1];
const char *PragmaString = "\nCF_IMPLICIT_BRIDGING_ENABLED\n\n";
edit::Commit commit(*Editor);
commit.insertBefore(FirstFD->getLocStart(), PragmaString);
PragmaString = "\n\nCF_IMPLICIT_BRIDGING_DISABLED\n";
SourceLocation EndLoc = LastFD->getLocEnd();
// get location just past end of function location.
EndLoc = PP.getLocForEndOfToken(EndLoc);
Token Tok;
// get locaiton of token that comes after end of function.
bool Failed = PP.getRawToken(EndLoc, Tok, /*IgnoreWhiteSpace=*/true);
if (!Failed)
EndLoc = Tok.getLocation();
commit.insertAfterToken(EndLoc, PragmaString);
Editor->commit(commit);
CFFunctionIBCandidates.clear();
}
// FIXME. Also must insert CF_IMPLICIT_BRIDGING_ENABLE/CF_IMPLICIT_BRIDGING_DISABLED
// when leaving current file.
else if (!CFFunctionIBCandidates.empty())
AnnotateImplicitBridging(Ctx);
}
bool ObjCMigrateASTConsumer::migrateAddFunctionAnnotation(
@ -929,7 +935,7 @@ public:
void ObjCMigrateASTConsumer::HandleTranslationUnit(ASTContext &Ctx) {
TranslationUnitDecl *TU = Ctx.getTranslationUnitDecl();
if (MigrateProperty)
if (MigrateProperty) {
for (DeclContext::decl_iterator D = TU->decls_begin(), DEnd = TU->decls_end();
D != DEnd; ++D) {
if (ObjCInterfaceDecl *CDecl = dyn_cast<ObjCInterfaceDecl>(*D))
@ -955,6 +961,9 @@ void ObjCMigrateASTConsumer::HandleTranslationUnit(ASTContext &Ctx) {
if (ObjCContainerDecl *CDecl = dyn_cast<ObjCContainerDecl>(*D))
migrateInstanceType(Ctx, CDecl);
}
if (!CFFunctionIBCandidates.empty())
AnnotateImplicitBridging(Ctx);
}
Rewriter rewriter(Ctx.getSourceManager(), Ctx.getLangOpts());
RewritesReceiver Rec(rewriter);

5
clang/test/ARCMT/objcmt-arc-cf-annotations.m
View File

@ -2037,7 +2037,4 @@ void rdar13783514(xpc_connection_t connection) {
xpc_connection_set_finalizer_f(connection, releaseAfterXPC);
} // no-warning
CFAttributedStringRef CFAttributedCreate(long attributes) CF_RETURNS_RETAINED;
CFTypeID CFGetTypeID(void) {
return 0;
}
CFAttributedStringRef CFAttributedCreate(void *CFObj CF_CONSUMED) CF_RETURNS_RETAINED;

5
clang/test/ARCMT/objcmt-arc-cf-annotations.m.result
View File

@ -2100,10 +2100,7 @@ void rdar13783514(xpc_connection_t connection) {
CF_IMPLICIT_BRIDGING_ENABLED
CFAttributedStringRef CFAttributedCreate(long attributes) CF_RETURNS_RETAINED;
CFAttributedStringRef CFAttributedCreate(void *CFObj CF_CONSUMED) CF_RETURNS_RETAINED;
CF_IMPLICIT_BRIDGING_DISABLED
CFTypeID CFGetTypeID(void) {
return 0;
}