3 files changed, 27 insertions, 1 deletions
diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h
index 83633ebf85..6bc45057d5 100644
--- a/include/clang/Basic/SourceLocation.h
+++ b/include/clang/Basic/SourceLocation.h
@@ -249,6 +249,8 @@ public:
   
   bool isFileID() const { return Loc.isFileID(); }
   
+  unsigned getCanonicalFileID() const;
+  
   bool operator==(const FullSourceLoc& RHS) const {
     return SrcMgr == RHS.SrcMgr && Loc == RHS.Loc;
   }
diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 59f1690778..700dcd31ac 100644
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -371,7 +371,15 @@ public:
   const FileEntry* getFileEntryForID(unsigned id) const {
     return getContentCache(id)->Entry;
   }
-    
+  
+  /// getCanonicalFileID - Return the canonical FileID for a SourceLocation.
+  ///  A file can have multiple FileIDs if it is large enough to be broken
+  ///  into multiple chunks.  This method returns the unique FileID without
+  ///  chunk information for a given SourceLocation.  Use this method when
+  ///  you want to compare FileIDs across SourceLocations.
+  unsigned getCanonicalFileID(SourceLocation PhysLoc) const {
+    return getDecomposedFileLoc(PhysLoc).first;
+  }    
   
   /// getDecomposedFileLoc - Decompose the specified file location into a raw
   /// FileID + Offset pair.  The first element is the FileID, the second is the
@@ -399,6 +407,18 @@ public:
     return getDecomposedFileLoc(PhysLoc).second;
   }
   
+  /// isFromSameFile - Returns true if both SourceLocations correspond to
+  ///  the same file.
+  bool isFromSameFile(SourceLocation Loc1, SourceLocation Loc2) const {
+    return getCanonicalFileID(Loc1) == getCanonicalFileID(Loc2);
+  }
+  
+  /// isFromMainFile - Returns true if the file of provided SourceLocation is
+  ///   the main file.
+  bool isFromMainFile(SourceLocation Loc) const {
+    return getCanonicalFileID(Loc) == getMainFileID();
+  } 
+  
   /// PrintStats - Print statistics to stderr.
   ///
   void PrintStats() const;
diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp
index c01447567f..83c264ad0b 100644
--- a/lib/Basic/SourceLocation.cpp
+++ b/lib/Basic/SourceLocation.cpp
@@ -88,3 +88,7 @@ const llvm::MemoryBuffer* FullSourceLoc::getBuffer() const {
   assert (isValid());
   return SrcMgr->getBuffer(Loc.getFileID());
 }
+
+unsigned FullSourceLoc::getCanonicalFileID() const {
+  return SrcMgr->getCanonicalFileID(Loc);
+}