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/CodeGenModule.cpp

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 924ec84..aab513f 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -1392,8 +1392,10 @@
     EmitCXXGlobalVarDeclInitFunc(D, GV);
 
   // Emit global variable debug information.
-  if (CGDebugInfo *DI = getModuleDebugInfo())
+  if (CGDebugInfo *DI = getModuleDebugInfo()) {
+    DI->setLocation(D->getLocation());
     DI->EmitGlobalVariable(GV, D);
+  }
 }
 
 llvm::GlobalValue::LinkageTypes