commit a11d61793341fea195c29a0dab3fbd74f2b39a8c
author Chris Lattner <sabre@nondot.org> Mon Jan 19 07:46:45 2009 +0000
committer Chris Lattner <sabre@nondot.org> Mon Jan 19 07:46:45 2009 +0000
tree 8cff5248e13216b898f92723678d94b9a0ff78d3
parent 9ee7d456b427e002f7fe1844b64bec8055c8db52

Rename SourceManager::getCanonicalFileID -> getFileID.  There is
no longer such thing as a non-canonical FileID.


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

lib/Driver/PlistDiagnostics.cpp

diff --git a/lib/Driver/PlistDiagnostics.cpp b/lib/Driver/PlistDiagnostics.cpp
index 0b2ca52..9b7da48 100644
--- a/lib/Driver/PlistDiagnostics.cpp
+++ b/lib/Driver/PlistDiagnostics.cpp
@@ -51,20 +51,18 @@
   return new PlistDiagnostics(s);
 }
 
-static void AddFID(FIDMap &FIDs,
-                   llvm::SmallVectorImpl<FileID> &V,
+static void AddFID(FIDMap &FIDs, llvm::SmallVectorImpl<FileID> &V,
                    SourceManager& SM, SourceLocation L) {
 
-  FileID FID = SM.getCanonicalFileID(SM.getInstantiationLoc(L));
+  FileID FID = SM.getFileID(SM.getInstantiationLoc(L));
   FIDMap::iterator I = FIDs.find(FID);
   if (I != FIDs.end()) return;
   FIDs[FID] = V.size();
   V.push_back(FID);
 }
 
-static unsigned GetFID(const FIDMap& FIDs,
-                       SourceManager& SM, SourceLocation L) {
-  FileID FID = SM.getCanonicalFileID(SM.getInstantiationLoc(L));
+static unsigned GetFID(const FIDMap& FIDs, SourceManager& SM, SourceLocation L){
+  FileID FID = SM.getFileID(SM.getInstantiationLoc(L));
   FIDMap::const_iterator I = FIDs.find(FID);
   assert(I != FIDs.end());
   return I->second;
@@ -178,7 +176,7 @@
     AddFID(FM, Fids, SM, I->getLocation());
 
     for (PathDiagnosticPiece::range_iterator RI=I->ranges_begin(),
-                                             RE=I->ranges_end(); RI!=RE; ++RI) {      
+                                             RE=I->ranges_end(); RI!=RE; ++RI) {
       AddFID(FM, Fids, SM, RI->getBegin());
       AddFID(FM, Fids, SM, RI->getEnd());
     }
@@ -229,7 +227,8 @@
   o << " </array>\n";
     
   // Output the bug type and bug category.  
-  o << " <key>description</key>\n <string>" << D->getDescription() << "</string>\n"
+  o << " <key>description</key>\n <string>" << D->getDescription()
+    << "</string>\n"
        " <key>category</key>\n <string>" << D->getCategory() << "</string>\n";
 
   // Finish.