Rename SourceLocation::getFileID to getChunkID, because it returns
the chunk ID not the file ID.  This exposes problems in 
TextDiagnosticPrinter where it should have been using the canonical
file ID but wasn't.  Fix these along the way.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62427 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp
index 84fac86..dcfd547 100644
--- a/lib/Basic/SourceLocation.cpp
+++ b/lib/Basic/SourceLocation.cpp
@@ -37,6 +37,12 @@
   return SourceRange(A,B);
 }
 
+FileID FullSourceLoc::getFileID() const {
+  assert(isValid());
+  return SrcMgr->getCanonicalFileID(*this);
+}
+
+
 FullSourceLoc FullSourceLoc::getInstantiationLoc() const {
   assert(isValid());
   return FullSourceLoc(SrcMgr->getInstantiationLoc(*this), *SrcMgr);