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

Integrate the following from the 'objective-rewrite' branch: 

http://llvm.org/viewvc/llvm-project?view=rev&revision=81871
http://llvm.org/viewvc/llvm-project?view=rev&revision=81936
http://llvm.org/viewvc/llvm-project?view=rev&revision=81945

llvm-svn: 90718
This commit is contained in:
Steve Naroff 2009-12-06 21:14:13 +00:00
parent ed085234dc
commit 30484700c5
1 changed files with 74 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
clang/lib/Frontend/RewriteObjC.cpp
View File

@ -331,8 +331,12 @@ namespace {
const char *funcName, std::string Tag); const char *funcName, std::string Tag);
std::string SynthesizeBlockFunc(BlockExpr *CE, int i, std::string SynthesizeBlockFunc(BlockExpr *CE, int i,
const char *funcName, std::string Tag); const char *funcName, std::string Tag);
std::string SynthesizeBlockImpl(BlockExpr *CE, std::string Tag, std::string SynthesizeBlockImpl(BlockExpr *CE,
bool hasCopyDisposeHelpers); std::string Tag, std::string Desc);
std::string SynthesizeBlockDescriptor(std::string DescTag,
std::string ImplTag,
int i, const char *funcName,
unsigned hasCopy);
Stmt *SynthesizeBlockCall(CallExpr *Exp); Stmt *SynthesizeBlockCall(CallExpr *Exp);
void SynthesizeBlockLiterals(SourceLocation FunLocStart, void SynthesizeBlockLiterals(SourceLocation FunLocStart,
const char *FunName); const char *FunName);
@ -551,7 +555,7 @@ void RewriteObjC::Initialize(ASTContext &context) {
Preamble += "struct __block_impl {\n"; Preamble += "struct __block_impl {\n";
Preamble += " void *isa;\n"; Preamble += " void *isa;\n";
Preamble += " int Flags;\n"; Preamble += " int Flags;\n";
Preamble += " int Size;\n"; Preamble += " int Reserved;\n";
Preamble += " void *FuncPtr;\n"; Preamble += " void *FuncPtr;\n";
Preamble += "};\n"; Preamble += "};\n";
Preamble += "// Runtime copy/destroy helper functions (from Block_private.h)\n"; Preamble += "// Runtime copy/destroy helper functions (from Block_private.h)\n";
@ -3795,19 +3799,17 @@ std::string RewriteObjC::SynthesizeBlockHelperFuncs(BlockExpr *CE, int i,
} }
std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag, std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
bool hasCopyDisposeHelpers) { std::string Desc) {
std::string S = "\nstruct " + Tag; std::string S = "\nstruct " + Tag;
std::string Constructor = " " + Tag; std::string Constructor = " " + Tag;
S += " {\n struct __block_impl impl;\n"; S += " {\n struct __block_impl impl;\n";
S += " struct " + Desc;
S += "* Desc;\n";
if (hasCopyDisposeHelpers) Constructor += "(void *fp, "; // Invoke function pointer.
S += " void *copy;\n void *dispose;\n"; Constructor += "struct " + Desc; // Descriptor pointer.
Constructor += " *desc";
Constructor += "(void *fp";
if (hasCopyDisposeHelpers)
Constructor += ", void *copyHelp, void *disposeHelp";
if (BlockDeclRefs.size()) { if (BlockDeclRefs.size()) {
// Output all "by copy" declarations. // Output all "by copy" declarations.
@ -3870,11 +3872,9 @@ std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
Constructor += " impl.isa = &_NSConcreteGlobalBlock;\n"; Constructor += " impl.isa = &_NSConcreteGlobalBlock;\n";
else else
Constructor += " impl.isa = &_NSConcreteStackBlock;\n"; Constructor += " impl.isa = &_NSConcreteStackBlock;\n";
Constructor += " impl.Size = sizeof("; Constructor += " impl.Flags = flags;\n impl.FuncPtr = fp;\n";
Constructor += Tag + ");\n impl.Flags = flags;\n impl.FuncPtr = fp;\n";
if (hasCopyDisposeHelpers) Constructor += " Desc = desc;\n";
Constructor += " copy = copyHelp;\n dispose = disposeHelp;\n";
// Initialize all "by copy" arguments. // Initialize all "by copy" arguments.
for (llvm::SmallPtrSet<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(), for (llvm::SmallPtrSet<ValueDecl*,8>::iterator I = BlockByCopyDecls.begin(),
@ -3905,10 +3905,8 @@ std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
Constructor += " impl.isa = &_NSConcreteGlobalBlock;\n"; Constructor += " impl.isa = &_NSConcreteGlobalBlock;\n";
else else
Constructor += " impl.isa = &_NSConcreteStackBlock;\n"; Constructor += " impl.isa = &_NSConcreteStackBlock;\n";
Constructor += " impl.Size = sizeof("; Constructor += " impl.Flags = flags;\n impl.FuncPtr = fp;\n";
Constructor += Tag + ");\n impl.Flags = flags;\n impl.FuncPtr = fp;\n"; Constructor += " Desc = desc;\n";
if (hasCopyDisposeHelpers)
Constructor += " copy = copyHelp;\n dispose = disposeHelp;\n";
} }
Constructor += " "; Constructor += " ";
Constructor += "}\n"; Constructor += "}\n";
@ -3917,6 +3915,29 @@ std::string RewriteObjC::SynthesizeBlockImpl(BlockExpr *CE, std::string Tag,
return S; return S;
} }
std::string RewriteObjC::SynthesizeBlockDescriptor(std::string DescTag,
std::string ImplTag, int i,
const char *FunName,
unsigned hasCopy) {
std::string S = "\nstatic struct " + DescTag;
S += " {\n unsigned long reserved;\n";
S += " unsigned long Block_size;\n";
if (hasCopy) {
S += " void *copy;\n void *dispose;\n";
}
S += "} ";
S += DescTag + "_DATA = { 0, sizeof(struct ";
S += ImplTag + ")";
if (hasCopy) {
S += ", __" + std::string(FunName) + "_block_copy_" + utostr(i);
S += ", __" + std::string(FunName) + "_block_dispose_" + utostr(i);
}
S += "};\n";
return S;
}
void RewriteObjC::SynthesizeBlockLiterals(SourceLocation FunLocStart, void RewriteObjC::SynthesizeBlockLiterals(SourceLocation FunLocStart,
const char *FunName) { const char *FunName) {
// Insert closures that were part of the function. // Insert closures that were part of the function.
@ -3924,21 +3945,24 @@ void RewriteObjC::SynthesizeBlockLiterals(SourceLocation FunLocStart,
CollectBlockDeclRefInfo(Blocks[i]); CollectBlockDeclRefInfo(Blocks[i]);
std::string Tag = "__" + std::string(FunName) + "_block_impl_" + utostr(i); std::string ImplTag = "__" + std::string(FunName) + "_block_impl_" + utostr(i);
std::string DescTag = "__" + std::string(FunName) + "_block_desc_" + utostr(i);
std::string CI = SynthesizeBlockImpl(Blocks[i], Tag, std::string CI = SynthesizeBlockImpl(Blocks[i], ImplTag, DescTag);
ImportedBlockDecls.size() > 0);
InsertText(FunLocStart, CI.c_str(), CI.size()); InsertText(FunLocStart, CI.c_str(), CI.size());
std::string CF = SynthesizeBlockFunc(Blocks[i], i, FunName, Tag); std::string CF = SynthesizeBlockFunc(Blocks[i], i, FunName, ImplTag);
InsertText(FunLocStart, CF.c_str(), CF.size()); InsertText(FunLocStart, CF.c_str(), CF.size());
if (ImportedBlockDecls.size()) { if (ImportedBlockDecls.size()) {
std::string HF = SynthesizeBlockHelperFuncs(Blocks[i], i, FunName, Tag); std::string HF = SynthesizeBlockHelperFuncs(Blocks[i], i, FunName, ImplTag);
InsertText(FunLocStart, HF.c_str(), HF.size()); InsertText(FunLocStart, HF.c_str(), HF.size());
} }
std::string BD = SynthesizeBlockDescriptor(DescTag, ImplTag, i, FunName,
ImportedBlockDecls.size() > 0);
InsertText(FunLocStart, BD.c_str(), BD.size());
BlockDeclRefs.clear(); BlockDeclRefs.clear();
BlockByRefDecls.clear(); BlockByRefDecls.clear();
@ -4348,25 +4372,21 @@ Stmt *RewriteObjC::SynthBlockInitExpr(BlockExpr *Exp) {
SourceLocation()); SourceLocation());
InitExprs.push_back(castExpr); InitExprs.push_back(castExpr);
if (ImportedBlockDecls.size()) { // Initialize the block descriptor.
std::string Buf = "__" + FuncName + "_block_copy_" + BlockNumber; std::string DescData = "__" + FuncName + "_block_desc_" + BlockNumber + "_DATA";
FD = SynthBlockInitFunctionDecl(Buf.c_str());
Arg = new (Context) DeclRefExpr(FD, FD->getType(), SourceLocation());
castExpr = new (Context) CStyleCastExpr(Context->VoidPtrTy,
CastExpr::CK_Unknown, Arg,
Context->VoidPtrTy, SourceLocation(),
SourceLocation());
InitExprs.push_back(castExpr);
Buf = "__" + FuncName + "_block_dispose_" + BlockNumber; VarDecl *NewVD = VarDecl::Create(*Context, TUDecl, SourceLocation(),
FD = SynthBlockInitFunctionDecl(Buf.c_str()); &Context->Idents.get(DescData.c_str()),
Arg = new (Context) DeclRefExpr(FD, FD->getType(), SourceLocation()); Context->VoidPtrTy, 0,
castExpr = new (Context) CStyleCastExpr(Context->VoidPtrTy, VarDecl::Static);
CastExpr::CK_Unknown, Arg, UnaryOperator *DescRefExpr = new (Context) UnaryOperator(
Context->VoidPtrTy, SourceLocation(), new (Context) DeclRefExpr(NewVD,
Context->VoidPtrTy, SourceLocation()),
UnaryOperator::AddrOf,
Context->getPointerType(Context->VoidPtrTy),
SourceLocation()); SourceLocation());
InitExprs.push_back(castExpr); InitExprs.push_back(DescRefExpr);
}
// Add initializers for any closure decl refs. // Add initializers for any closure decl refs.
if (BlockDeclRefs.size()) { if (BlockDeclRefs.size()) {
Expr *Exp; Expr *Exp;
@ -4402,6 +4422,17 @@ Stmt *RewriteObjC::SynthBlockInitExpr(BlockExpr *Exp) {
InitExprs.push_back(Exp); InitExprs.push_back(Exp);
} }
} }
if (ImportedBlockDecls.size()) { // generate "1<<25" to indicate we have helper functions.
unsigned IntSize =
static_cast<unsigned>(Context->getTypeSize(Context->IntTy));
BinaryOperator *Exp = new (Context) BinaryOperator(
new (Context) IntegerLiteral(llvm::APInt(IntSize, 1),
Context->IntTy,SourceLocation()),
new (Context) IntegerLiteral(llvm::APInt(IntSize, 25),
Context->IntTy, SourceLocation()),
BinaryOperator::Shl, Context->IntTy, SourceLocation());
InitExprs.push_back(Exp);
}
NewRep = new (Context) CallExpr(*Context, DRE, &InitExprs[0], InitExprs.size(), NewRep = new (Context) CallExpr(*Context, DRE, &InitExprs[0], InitExprs.size(),
FType, SourceLocation()); FType, SourceLocation());
NewRep = new (Context) UnaryOperator(NewRep, UnaryOperator::AddrOf, NewRep = new (Context) UnaryOperator(NewRep, UnaryOperator::AddrOf,