intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-28 10:38:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Debug info for blocks: Fix a bug caught by the Verifier.

Browse Source 
When emitting nested block definitions, the insert-at-point variant of
DIBuilder::insertDeclare() could be called with the insertion point set
to the end-of-BasicBlock sentinel, causing the parent pointer of the
CallInst to be set to the intentionally bogus value of the sentinel.

Fixed by conditionally invoking the correct version of insertDeclare().
rdar://problem/19034882

llvm-svn: 222487
This commit is contained in:
Adrian Prantl
2014-11-21 00:35:25 +00:00
parent b5b4dd81ba
commit 88eec39460
4 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1243,7 +1243,9 @@ CodeGenFunction::GenerateBlockFunction(GlobalDecl GD,
}
DI->EmitDeclareOfBlockDeclRefVariable(variable, BlockPointerDbgLoc,
Builder, blockInfo);
Builder, blockInfo,
entry_ptr == entry->end()
? nullptr : entry_ptr);
}
}
// Recover location if it was changed in the above loop.

9
clang/lib/CodeGen/CGDebugInfo.cpp
View File

@@ -2940,7 +2940,7 @@ llvm::DIType CGDebugInfo::CreateSelfType(const QualType &QualTy,
void CGDebugInfo::EmitDeclareOfBlockDeclRefVariable(
const VarDecl *VD, llvm::Value *Storage, CGBuilderTy &Builder,
const CGBlockInfo &blockInfo) {
const CGBlockInfo &blockInfo, llvm::Instruction *InsertPoint) {
assert(DebugKind >= CodeGenOptions::LimitedDebugInfo);
assert(!LexicalBlockStack.empty() && "Region stack mismatch, stack empty!");
@@ -2998,8 +2998,11 @@ void CGDebugInfo::EmitDeclareOfBlockDeclRefVariable(
VD->getName(), Unit, Line, Ty);
// Insert an llvm.dbg.declare into the current block.
llvm::Instruction *Call = DBuilder.insertDeclare(
Storage, D, DBuilder.createExpression(addr), Builder.GetInsertPoint());
llvm::Instruction *Call = InsertPoint ?
DBuilder.insertDeclare(Storage, D, DBuilder.createExpression(addr),
InsertPoint)
: DBuilder.insertDeclare(Storage, D, DBuilder.createExpression(addr),
Builder.GetInsertBlock());
Call->setDebugLoc(
llvm::DebugLoc::get(Line, Column, LexicalBlockStack.back()));
}

3
clang/lib/CodeGen/CGDebugInfo.h
View File

@@ -263,7 +263,8 @@ public:
void EmitDeclareOfBlockDeclRefVariable(const VarDecl *variable,
llvm::Value *storage,
CGBuilderTy &Builder,
const CGBlockInfo &blockInfo);
const CGBlockInfo &blockInfo,
llvm::Instruction *InsertPoint = 0);
/// EmitDeclareOfArgVariable - Emit call to llvm.dbg.declare for an argument
/// variable declaration.

26
clang/test/CodeGenObjC/debug-info-nested-blocks.m Normal file
View File

@@ -0,0 +1,26 @@
// RUN: %clang_cc1 -emit-llvm -gdwarf-2 -fblocks -o - -x objective-c %s| FileCheck %s
// This code triggered a bug where a dbg.declare intrinsic ended up with the
// wrong parent and subsequently failed the Verifier.
void baz(id b);
void fub(id block);
int foo(void);
void bar(void) {
fub(^() {
id a;
id b = [a bar:^(int e){}];
if (b) {
^() {
if ((0 && foo()) ? 1 : 0) {
baz([a aMessage]);
}
};
}
});
}
// Verify that debug info for BlockPointerDbgLoc is emitted for the
// innermost block.
//
// CHECK: define {{.*}}void @__bar_block_invoke_3(i8* %.block_descriptor)
// CHECK: %[[BLOCKADDR:.*]] = alloca <{{.*}}>*, align 8
// CHECK: call void @llvm.dbg.declare(metadata !{{.*}}%[[BLOCKADDR]]