Introduce SourceManager::getFileLoc which returns a file location

taking into account macro arguments.

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

diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 12e7cdfc205f7f56aada4f8a428e13140e0befc2..985ddd641271ce6183431a4a1d14994fcef9f138 100644 (file)
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -828,6 +828,14 @@ public:
     return getExpansionLocSlowCase(Loc);
   }
 
+  /// \brief Given \arg Loc, if it is a macro location return the expansion
+  /// location or the spelling location, depending on if it comes from a
+  /// macro argument or not.
+  SourceLocation getFileLoc(SourceLocation Loc) const {
+    if (Loc.isFileID()) return Loc;
+    return getFileLocSlowCase(Loc);
+  }
+
   /// getImmediateExpansionRange - Loc is required to be an expansion location.
   /// Return the start/end of the expansion information.
   std::pair<SourceLocation,SourceLocation>
@@ -1301,6 +1309,7 @@ private:
 
   SourceLocation getExpansionLocSlowCase(SourceLocation Loc) const;
   SourceLocation getSpellingLocSlowCase(SourceLocation Loc) const;
+  SourceLocation getFileLocSlowCase(SourceLocation Loc) const;
 
   std::pair<FileID, unsigned>
   getDecomposedExpansionLocSlowCase(const SrcMgr::SLocEntry *E) const;

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index a540f3b9450fafbc3579b2540748e6ef399dd42b..364663ee32651c6c06a17d9880a16ca322a2442f 100644 (file)
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -815,6 +815,16 @@ SourceLocation SourceManager::getSpellingLocSlowCase(SourceLocation Loc) const {
   return Loc;
 }
 
+SourceLocation SourceManager::getFileLocSlowCase(SourceLocation Loc) const {
+  do {
+    if (isMacroArgExpansion(Loc))
+      Loc = getImmediateSpellingLoc(Loc);
+    else
+      Loc = getImmediateExpansionRange(Loc).first;
+  } while (!Loc.isFileID());
+  return Loc;
+}
+
 
 std::pair<FileID, unsigned>
 SourceManager::getDecomposedExpansionLocSlowCase(