Shuffle some call code around. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68557 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index e01df8d..c8d9655 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -412,10 +412,6 @@
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 @@
// 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 @@
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);
}