commit e83b130defce6ff6ee69c300c14eec52cabadc88
author Adrian Prantl <aprantl@apple.com> Tue Jan 07 22:05:52 2014 +0000
committer Adrian Prantl <aprantl@apple.com> Tue Jan 07 22:05:52 2014 +0000
tree 9bc431d4fc921f2a655bac0434af56ce12c10ac9
parent c6758879b3b048e334a84f436cae47f2c314be0b

Revert "Debug info: Ensure that the last stop point in a function is still within"

This reverts commit r198461.

llvm-svn: 198714

clang/lib/CodeGen/CGDebugInfo.cpp

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 3138d82..2977ed2 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -2537,8 +2537,7 @@
 /// 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,
-                               llvm::MDNode *ForceScope) {
+                               bool ForceColumnInfo) {
   // Update our current location
   setLocation(Loc);
 
@@ -2557,7 +2556,7 @@
   // Update last state.
   PrevLoc = CurLoc;
 
-  llvm::MDNode *Scope = ForceScope ? ForceScope : &*LexicalBlockStack.back();
+  llvm::MDNode *Scope = LexicalBlockStack.back();
   Builder.SetCurrentDebugLocation(llvm::DebugLoc::get
                                   (getLineNumber(CurLoc),
                                    getColumnNumber(CurLoc, ForceColumnInfo),