commit 11de9a966a34a7a50611c3179885fefe2c83e6b2
author Devang Patel <dpatel@apple.com> Mon Jul 18 22:18:04 2011 +0000
committer Devang Patel <dpatel@apple.com> Mon Jul 18 22:18:04 2011 +0000
tree 1585281edc6f2b61ceaffb7a212237a81c92692f
parent d84a9a12490d6025a2c5dfcfa357b81ea8e106bc

Check column number also.

llvm-svn: 135437

clang/lib/CodeGen/CGDebugInfo.cpp

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index c1687b3..0008919 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1740,9 +1740,11 @@
   // Don't bother if things are the same as last time.
   SourceManager &SM = CGM.getContext().getSourceManager();
   if (CurLoc == PrevLoc
-       || (SM.getInstantiationLineNumber(CurLoc) ==
-           SM.getInstantiationLineNumber(PrevLoc)
-           && SM.isFromSameFile(CurLoc, PrevLoc)))
+      || ((SM.getInstantiationLineNumber(CurLoc)
+           == SM.getInstantiationLineNumber(PrevLoc))
+          && (SM.getInstantiationColumnNumber(CurLoc) 
+              == SM.getInstantiationColumnNumber(PrevLoc))
+          && SM.isFromSameFile(CurLoc, PrevLoc)))
     // New Builder may not be in sync with CGDebugInfo.
     if (!Builder.getCurrentDebugLocation().isUnknown())
       return;