diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 0008919..3c9b3eb 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1739,12 +1739,8 @@
 
   // 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.getInstantiationColumnNumber(CurLoc) 
-              == SM.getInstantiationColumnNumber(PrevLoc))
-          && SM.isFromSameFile(CurLoc, PrevLoc)))
+  if (CurLoc == PrevLoc || 
+      SM.getInstantiationLoc(CurLoc) == SM.getInstantiationLoc(PrevLoc))
     // New Builder may not be in sync with CGDebugInfo.
     if (!Builder.getCurrentDebugLocation().isUnknown())
       return;