commit 28e06354b5d4dd539be6781e388ff27c0dffd807
author Eric Christopher <echristo@apple.com> Wed Oct 12 18:39:35 2011 +0000
committer Eric Christopher <echristo@apple.com> Wed Oct 12 18:39:35 2011 +0000
tree 6e224a320ad39dcab3b12a05e16bd4a6c97d162e
parent d596c4d3f8931f4d479e965bf46d0e7edad85570

Revert file/scope handling patches. gdb testing revealed a couple of bugs.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141796 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGObjC.cpp

diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp
index 51f2053..344c1ee 100644
--- a/lib/CodeGen/CGObjC.cpp
+++ b/lib/CodeGen/CGObjC.cpp
@@ -1208,8 +1208,10 @@
   }
 
   CGDebugInfo *DI = getDebugInfo();
-  if (DI)
-    DI->EmitLexicalBlockStart(Builder, S.getSourceRange().getBegin());
+  if (DI) {
+    DI->setLocation(S.getSourceRange().getBegin());
+    DI->EmitLexicalBlockStart(Builder);
+  }
 
   // The local variable comes into scope immediately.
   AutoVarEmission variable = AutoVarEmission::invalid();
@@ -1463,8 +1465,10 @@
     EmitStoreThroughLValue(RValue::get(null), elementLValue);
   }
 
-  if (DI)
-    DI->EmitLexicalBlockEnd(Builder, S.getSourceRange().getEnd());
+  if (DI) {
+    DI->setLocation(S.getSourceRange().getEnd());
+    DI->EmitLexicalBlockEnd(Builder);
+  }
 
   // Leave the cleanup we entered in ARC.
   if (getLangOptions().ObjCAutoRefCount)
@@ -2500,8 +2504,10 @@
   const CompoundStmt &S = cast<CompoundStmt>(*subStmt);
 
   CGDebugInfo *DI = getDebugInfo();
-  if (DI)
-    DI->EmitLexicalBlockStart(Builder, S.getLBracLoc());
+  if (DI) {
+    DI->setLocation(S.getLBracLoc());
+    DI->EmitLexicalBlockStart(Builder);
+  }
 
   // Keep track of the current cleanup stack depth.
   RunCleanupsScope Scope(*this);
@@ -2517,8 +2523,10 @@
        E = S.body_end(); I != E; ++I)
     EmitStmt(*I);
 
-  if (DI)
-    DI->EmitLexicalBlockEnd(Builder, S.getRBracLoc());
+  if (DI) {
+    DI->setLocation(S.getRBracLoc());
+    DI->EmitLexicalBlockEnd(Builder);
+  }
 }
 
 /// EmitExtendGCLifetime - Given a pointer to an Objective-C object,