now that everything properly handles multiply instantiated

source locations, allow creation of them.  We can now say that
a token was instantiated here, then here, then here.

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

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index f9f51afef84747bb5873c558612039d85849f237..6c82b9bf2e853aa7adea71e98e8f60a094b989ae 100644 (file)
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -201,14 +201,6 @@ FileID SourceManager::createFileID(const ContentCache *File,
 SourceLocation SourceManager::createInstantiationLoc(SourceLocation SpellingLoc,
                                                      SourceLocation InstantLoc,
                                                      unsigned TokLength) {
-  // The specified source location may be a mapped location, due to a macro
-  // instantiation or #line directive.  Strip off this information to find out
-  // where the characters are actually located.
-  SpellingLoc = getSpellingLoc(SpellingLoc);
-  
-  // Resolve InstantLoc down to a real instantiation location.
-  InstantLoc = getInstantiationLoc(InstantLoc);
-
   SLocEntryTable.push_back(SLocEntry::get(NextOffset, 
                                           InstantiationInfo::get(InstantLoc,
                                                                  SpellingLoc)));