Temporarily revert this to see if it brings the gdb bot back.

llvm-svn: 160049
This commit is contained in:
Eric Christopher 2012-07-11 15:32:13 +00:00
parent 1808bbedaf
commit f8b9809fab
3 changed files with 6 additions and 24 deletions

View File

@ -2135,6 +2135,10 @@ void CGDebugInfo::EmitLexicalBlockStart(CGBuilderTy &Builder, SourceLocation Loc
/// region - end of a DW_TAG_lexical_block.
void CGDebugInfo::EmitLexicalBlockEnd(CGBuilderTy &Builder, SourceLocation Loc) {
assert(!LexicalBlockStack.empty() && "Region stack mismatch, stack empty!");
// Provide an entry in the line table for the end of the block.
EmitLocation(Builder, Loc);
LexicalBlockStack.pop_back();
}

View File

@ -854,11 +854,8 @@ public:
/// cleanups.
~LexicalScope() {
if (PopDebugStack) {
if (CGDebugInfo *DI = CGF.getDebugInfo()) {
if (RunCleanupsScope::requiresCleanups())
DI->EmitLocation(CGF.Builder, Range.getEnd());
DI->EmitLexicalBlockEnd(CGF.Builder, Range.getEnd());
}
CGDebugInfo *DI = CGF.getDebugInfo();
if (DI) DI->EmitLexicalBlockEnd(CGF.Builder, Range.getEnd());
}
}
@ -867,8 +864,6 @@ public:
void ForceCleanup() {
RunCleanupsScope::ForceCleanup();
if (CGDebugInfo *DI = CGF.getDebugInfo()) {
if (RunCleanupsScope::requiresCleanups())
DI->EmitLocation(CGF.Builder, Range.getEnd());
DI->EmitLexicalBlockEnd(CGF.Builder, Range.getEnd());
PopDebugStack = false;
}

View File

@ -1,17 +0,0 @@
// RUN: %clang_cc1 -g -S -emit-llvm %s -o - | FileCheck %s
int bar();
int foo(int i) {
int j = 0;
if (i) {
j = bar();
}
else {
j = bar() + 2;
}
return j;
}
// Make sure we don't have a line table entry for a block with no cleanups.
// CHECK-NOT: i32 9, i32 3, metadata