summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGBlocks.cpp
diff options
context:
space:
mode:
authorNick Lewycky <nicholas@mxc.ca>2013-10-02 02:29:49 +0000
committerNick Lewycky <nicholas@mxc.ca>2013-10-02 02:29:49 +0000
commit2d84e84236d6b68ddb39085539b4a4896bd803ac (patch)
tree06d1158c5c17c800c2a65ff2c6d7b0c347f46f63 /clang/lib/CodeGen/CGBlocks.cpp
parentb7aa592c19703492925e346317f36192b4669c4b (diff)
downloadbcm5719-llvm-2d84e84236d6b68ddb39085539b4a4896bd803ac.tar.gz
bcm5719-llvm-2d84e84236d6b68ddb39085539b4a4896bd803ac.zip
Thread a SourceLocation into the EmitCheck for "load_invalid_value". This occurs
when scalars are loaded / undergo lvalue-to-rvalue conversion. llvm-svn: 191808
Diffstat (limited to 'clang/lib/CodeGen/CGBlocks.cpp')
-rw-r--r--clang/lib/CodeGen/CGBlocks.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp
index 0db5a90bdc7..692f9a0dd63 100644
--- a/clang/lib/CodeGen/CGBlocks.cpp
+++ b/clang/lib/CodeGen/CGBlocks.cpp
@@ -834,7 +834,7 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const CGBlockInfo &blockInfo) {
type->isBlockPointerType()) {
// Load the block and do a simple retain.
LValue srcLV = MakeAddrLValue(src, type, align);
- llvm::Value *value = EmitLoadOfScalar(srcLV);
+ llvm::Value *value = EmitLoadOfScalar(srcLV, SourceLocation());
value = EmitARCRetainNonBlock(value);
// Do a primitive store to the block field.
@@ -931,7 +931,7 @@ llvm::Type *CodeGenModule::getGenericBlockLiteralType() {
}
-RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr* E,
+RValue CodeGenFunction::EmitBlockCallExpr(const CallExpr *E,
ReturnValueSlot ReturnValue) {
const BlockPointerType *BPT =
E->getCallee()->getType()->getAs<BlockPointerType>();
OpenPOWER on IntegriCloud