make getInstantiationLoc and getSpellingLoc handle multiply instantiated

locations, and move the slow case out of line.  No perf change on cocoa.h

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

diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 41c2defacd5f2642d6b48abae28fcb57a6dca8c9..84aabe1f3103c03b46cca8bbd0780df33cb552ef 100644 (file)
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -415,24 +415,20 @@ public:
   /// Given a SourceLocation object, return the instantiation location
   /// referenced by the ID.
   SourceLocation getInstantiationLoc(SourceLocation Loc) const {
-    // File locations work!
+    // Handle the non-mapped case inline, defer to out of line code to handle
+    // instantiations.
     if (Loc.isFileID()) return Loc;
-    
-    std::pair<FileID, unsigned> LocInfo = getDecomposedLoc(Loc);
-    Loc = getSLocEntry(LocInfo.first).getInstantiation().getInstantiationLoc();
-    return Loc.getFileLocWithOffset(LocInfo.second);
+    return getInstantiationLocSlowCase(Loc);
   }
   
   /// getSpellingLoc - Given a SourceLocation object, return the spelling
   /// location referenced by the ID.  This is the place where the characters
   /// that make up the lexed token can be found.
   SourceLocation getSpellingLoc(SourceLocation Loc) const {
-    // File locations work!
+    // Handle the non-mapped case inline, defer to out of line code to handle
+    // instantiations.
     if (Loc.isFileID()) return Loc;
-    
-    std::pair<FileID, unsigned> LocInfo = getDecomposedLoc(Loc);
-    Loc = getSLocEntry(LocInfo.first).getInstantiation().getSpellingLoc();
-    return Loc.getFileLocWithOffset(LocInfo.second);
+    return getSpellingLocSlowCase(Loc);
   }
 
   /// getDecomposedLoc - Decompose the specified location into a raw FileID +
@@ -614,6 +610,9 @@ private:
   
   FileID getFileIDSlow(unsigned SLocOffset) const;
 
+  SourceLocation getInstantiationLocSlowCase(SourceLocation Loc) const;
+  SourceLocation getSpellingLocSlowCase(SourceLocation Loc) const;
+
   std::pair<FileID, unsigned>
   getDecomposedInstantiationLocSlowCase(const SrcMgr::SLocEntry *E,
                                         unsigned Offset) const;  

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index 031bf4dcbcc5914bf52300a2dfdd0988309a7449..f9f51afef84747bb5873c558612039d85849f237 100644 (file)
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -328,6 +328,27 @@ FileID SourceManager::getFileIDSlow(unsigned SLocOffset) const {
   }
 }
 
+SourceLocation SourceManager::
+getInstantiationLocSlowCase(SourceLocation Loc) const {
+  do {
+    std::pair<FileID, unsigned> LocInfo = getDecomposedLoc(Loc);
+    Loc =getSLocEntry(LocInfo.first).getInstantiation().getInstantiationLoc();
+    Loc = Loc.getFileLocWithOffset(LocInfo.second);
+  } while (!Loc.isFileID());
+
+  return Loc;
+}
+
+SourceLocation SourceManager::getSpellingLocSlowCase(SourceLocation Loc) const {
+  do {
+    std::pair<FileID, unsigned> LocInfo = getDecomposedLoc(Loc);
+    Loc = getSLocEntry(LocInfo.first).getInstantiation().getSpellingLoc();
+    Loc = Loc.getFileLocWithOffset(LocInfo.second);
+  } while (!Loc.isFileID());
+  return Loc;
+}
+
+
 std::pair<FileID, unsigned>
 SourceManager::getDecomposedInstantiationLocSlowCase(const SrcMgr::SLocEntry *E,
                                                      unsigned Offset) const {