Reuse SourceManager.getFileLoc method

Author: SergejSalnikov

clang/include/clang/Basic/SourceManager.h

@@ -1250,22 +1250,6 @@ class SourceManager : public RefCountedBase<SourceManager> {
     return getSpellingLocSlowCase(Loc);
   }
 
-  /// Given a SourceLocation object, return the refined spelling
-  /// location referenced by the ID.
-  ///
-  /// The key difference to \ref getSpellingLoc is that the source location
-  /// for macro body is resolved to the expansion site.
-  ///
-  /// This is the place where the characters that make up the lexed token
-  /// can be found.
-  SourceLocation getRefinedSpellingLoc(SourceLocation Loc) const {
-    // Handle the non-mapped case inline, defer to out of line code to handle
-    // expansions.
-    if (Loc.isFileID())
-      return Loc;
-    return getRefinedSpellingLocSlowCase(Loc);
-  }
-
   /// Given a SourceLocation object, return the spelling location
   /// referenced by the ID.
   ///

clang/lib/Basic/SourceManager.cpp

@@ -915,8 +915,7 @@ SourceLocation SourceManager::getSpellingLocSlowCase(SourceLocation Loc) const {
   return Loc;
 }
 
-SourceLocation
-SourceManager::getRefinedSpellingLocSlowCase(SourceLocation Loc) const {
+SourceLocation SourceManager::getFileLocSlowCase(SourceLocation Loc) const {
   do {
     const SLocEntry &Entry = getSLocEntry(getFileID(Loc));
     const ExpansionInfo &ExpInfo = Entry.getExpansion();
@@ -930,16 +929,6 @@ SourceManager::getRefinedSpellingLocSlowCase(SourceLocation Loc) const {
   return Loc;
 }
 
-SourceLocation SourceManager::getFileLocSlowCase(SourceLocation Loc) const {
-  do {
-    if (isMacroArgExpansion(Loc))
-      Loc = getImmediateSpellingLoc(Loc);
-    else
-      Loc = getImmediateExpansionRange(Loc).getBegin();
-  } while (!Loc.isFileID());
-  return Loc;
-}
-
 FileIDAndOffset SourceManager::getDecomposedExpansionLocSlowCase(
     const SrcMgr::SLocEntry *E) const {
   // If this is an expansion record, walk through all the expansion points.