return NSConcreteStackBlock;
}
-llvm::Constant *CodeGenFunction::BuildBlockLiteralTmp() {
+llvm::Constant *CodeGenFunction::BuildBlockLiteralTmp(const BlockExpr *BE) {
// FIXME: Push up
bool BlockHasCopyDispose = false;
bool insideFunction = false;
Elts.push_back(C);
// __FuncPtr
- // FIXME: Build this up.
- Elts.push_back(C);
+ std::string Name;
+ if (const NamedDecl *ND = dyn_cast<NamedDecl>(CurFuncDecl))
+ Name = ND->getNameAsString();
+ BlockInfo Info(0, Name);
+ llvm::Function *Fn = CodeGenFunction(*this).GenerateBlockFunction(BE, Info);
+ Elts.push_back(Fn);
// __descriptor
Elts.push_back(BuildDescriptorBlockDecl());
Func, Args);
}
-llvm::Constant *CodeGenModule::GetAddrOfGlobalBlock(const BlockExpr *BE) {
+llvm::Constant *
+CodeGenModule::GetAddrOfGlobalBlock(const BlockExpr *BE, std::string n) {
// Generate the block descriptor.
const llvm::Type *UnsignedLongTy = Types.ConvertType(Context.UnsignedLongTy);
const llvm::IntegerType *IntTy = cast<llvm::IntegerType>(
// Generate the constants for the block literal.
llvm::Constant *LiteralFields[5];
- CodeGenFunction::BlockInfo Info(0, "global");
+ CodeGenFunction::BlockInfo Info(0, n);
llvm::Function *Fn = CodeGenFunction(*this).GenerateBlockFunction(BE, Info);
// isa
const CGFunctionInfo &FI =
CGM.getTypes().getFunctionInfo(FTy->getResultType(), Args);
- std::string Name = std::string("__block_function_") + Info.NameSuffix;
-
+ std::string Name = std::string("__") + Info.Name + "_block_invoke_";
CodeGenTypes &Types = CGM.getTypes();
const llvm::FunctionType *LTy = Types.GetFunctionType(FI, FTy->isVariadic());
}
llvm::Constant *VisitBlockExpr(const BlockExpr *E) {
- return CGM.GetAddrOfGlobalBlock(E);
+ const char *Name = "";
+ if (const NamedDecl *ND = dyn_cast<NamedDecl>(CGF->CurFuncDecl))
+ Name = ND->getNameAsString().c_str();
+ return CGM.GetAddrOfGlobalBlock(E, Name);
}
// Utility methods
Value *ScalarExprEmitter::VisitBlockExpr(const BlockExpr *BE) {
- llvm::Constant *C = CGF.BuildBlockLiteralTmp();
+ llvm::Constant *C = CGF.BuildBlockLiteralTmp(BE);
const llvm::PointerType *PtrToInt8Ty
= llvm::PointerType::getUnqual(llvm::Type::Int8Ty);
const llvm::Type *LLVMIntTy;
uint32_t LLVMPointerWidth;
- llvm::Constant *BuildBlockLiteralTmp();
+ llvm::Constant *BuildBlockLiteralTmp(const BlockExpr *);
llvm::Constant *BuildDescriptorBlockDecl();
public:
void GenerateObjCSetter(ObjCImplementationDecl *IMP,
const ObjCPropertyImplDecl *PID);
+ /// BlockInfo - Information to generate a block literal.
struct BlockInfo {
+ /// BlockLiteralTy - The type of the block literal.
const llvm::Type *BlockLiteralTy;
-
- const char *NameSuffix;
- BlockInfo(const llvm::Type *blt, const char *ns)
- : BlockLiteralTy(blt), NameSuffix(ns) {}
+ /// Name - the name of the function this block was created for, if any
+ std::string Name;
+
+ BlockInfo(const llvm::Type *blt, std::string n)
+ : BlockLiteralTy(blt), Name(n) {}
};
llvm::Function *GenerateBlockFunction(const BlockExpr *Expr,
llvm::Constant *GetAddrOfConstantCString(const std::string &str,
const char *GlobalName=0);
- llvm::Constant *GetAddrOfGlobalBlock(const BlockExpr *BE);
+ llvm::Constant *GetAddrOfGlobalBlock(const BlockExpr *BE, std::string);
/// getBuiltinLibFunction - Given a builtin id for a function like
/// "__builtin_fabsf", return a Function* for "fabsf".