Debug info: Ensure that the last stop point in a function is still within
the lexical block formed by the compound statement that is the function
body.
rdar://problem/15010825
llvm-svn: 198461
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index fec1c33..c12e294 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -2537,7 +2537,8 @@
/// information in the source file. If the location is invalid, the
/// previous location will be reused.
void CGDebugInfo::EmitLocation(CGBuilderTy &Builder, SourceLocation Loc,
- bool ForceColumnInfo) {
+ bool ForceColumnInfo,
+ llvm::MDNode *ForceScope) {
// Update our current location
setLocation(Loc);
@@ -2556,7 +2557,7 @@
// Update last state.
PrevLoc = CurLoc;
- llvm::MDNode *Scope = LexicalBlockStack.back();
+ llvm::MDNode *Scope = ForceScope ? ForceScope : &*LexicalBlockStack.back();
Builder.SetCurrentDebugLocation(llvm::DebugLoc::get
(getLineNumber(CurLoc),
getColumnNumber(CurLoc, ForceColumnInfo),