remove the SourceManager:: and FullSourceLoc::getFileEntryForLoc methods.

llvm-svn: 62496

2 files changed, 1 insertions, 6 deletions

diff --git a/clang/lib/Basic/SourceLocation.cpp b/clang/lib/Basic/SourceLocation.cpp
index 1f5804ff9ca..66ad720bb3b 100644
--- a/clang/lib/Basic/SourceLocation.cpp
+++ b/clang/lib/Basic/SourceLocation.cpp
@@ -94,11 +94,6 @@ const char* FullSourceLoc::getSourceName() const {
   return SrcMgr->getSourceName(*this);
 }
 
-const FileEntry* FullSourceLoc::getFileEntryForLoc() const { 
-  assert(isValid());
-  return SrcMgr->getFileEntryForLoc(*this);
-}
-
 bool FullSourceLoc::isInSystemHeader() const {
   assert(isValid());
   return SrcMgr->isInSystemHeader(*this);
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 9cbefa3d069..5e4a95cc0cf 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -51,7 +51,7 @@ llvm::DICompileUnit CGDebugInfo::getOrCreateCompileUnit(SourceLocation Loc) {
     return llvm::DICompileUnit();
 
   SourceManager &SM = M->getContext().getSourceManager();
-  const FileEntry *FE = SM.getFileEntryForLoc(Loc);
+  const FileEntry *FE = SM.getFileEntryForID(SM.getCanonicalFileID(Loc));
   if (FE == 0) return llvm::DICompileUnit();
     
   // See if this compile unit has been used before.