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

Shuffle some call code around. No functionality change. 

llvm-svn: 68557
This commit is contained in:
Anders Carlsson 2009-04-07 22:10:22 +00:00
parent 3a148f2625
commit 5f50c651e9
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clang/lib/CodeGen/CGBlocks.cpp
View File

@ -412,10 +412,6 @@ RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr* E) {
const BlockPointerType *BPT =
E->getCallee()->getType()->getAsBlockPointerType();
const CGFunctionInfo &FnInfo = CGM.getTypes().getFunctionInfo(BPT);
bool IsVariadic =
BPT->getPointeeType()->getAsFunctionProtoType()->isVariadic();
llvm::Value *Callee = EmitScalarExpr(E->getCallee());
// Get a pointer to the generic block literal.
@ -428,14 +424,6 @@ RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr* E) {
// Get the function pointer from the literal.
llvm::Value *FuncPtr = Builder.CreateStructGEP(BlockLiteral, 3, "tmp");
llvm::Value *Func = Builder.CreateLoad(FuncPtr, false, "tmp");
// Cast the function pointer to the right type.
const llvm::Type *BlockFTy =
CGM.getTypes().GetFunctionType(FnInfo, IsVariadic);
const llvm::Type *BlockFTyPtr = llvm::PointerType::getUnqual(BlockFTy);
Func = Builder.CreateBitCast(Func, BlockFTyPtr);
BlockLiteral =
Builder.CreateBitCast(BlockLiteral,
@ -453,6 +441,20 @@ RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr* E) {
Args.push_back(std::make_pair(EmitAnyExprToTemp(*i),
i->getType()));
// Load the function.
llvm::Value *Func = Builder.CreateLoad(FuncPtr, false, "tmp");
const CGFunctionInfo &FnInfo = CGM.getTypes().getFunctionInfo(BPT);
bool IsVariadic =
BPT->getPointeeType()->getAsFunctionProtoType()->isVariadic();
// Cast the function pointer to the right type.
const llvm::Type *BlockFTy =
CGM.getTypes().GetFunctionType(FnInfo, IsVariadic);
const llvm::Type *BlockFTyPtr = llvm::PointerType::getUnqual(BlockFTy);
Func = Builder.CreateBitCast(Func, BlockFTyPtr);
// And call the block.
return EmitCall(FnInfo, Func, Args);
}