In SourceManager::translateLineCol, handle the case where we are pointing
directly at the end of the source file.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140192 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index 68c98fe..f15c5dc 100644
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -1453,8 +1453,10 @@
if (!Entry.isFile())
return SourceLocation();
+ SourceLocation FileLoc = SourceLocation::getFileLoc(Entry.getOffset());
+
if (Line == 1 && Col == 1)
- return getLocForStartOfFile(FID);
+ return FileLoc;
ContentCache *Content
= const_cast<ContentCache *>(Entry.getFile().getContentCache());
@@ -1474,21 +1476,24 @@
unsigned Size = Content->getBuffer(Diag, *this)->getBufferSize();
if (Size > 0)
--Size;
- return getLocForStartOfFile(FID).getLocWithOffset(Size);
+ return FileLoc.getLocWithOffset(Size);
}
unsigned FilePos = Content->SourceLineCache[Line - 1];
const char *Buf = Content->getBuffer(Diag, *this)->getBufferStart() + FilePos;
unsigned BufLength = Content->getBuffer(Diag, *this)->getBufferEnd() - Buf;
+ if (BufLength == 0)
+ return FileLoc.getLocWithOffset(FilePos);
+
unsigned i = 0;
// Check that the given column is valid.
while (i < BufLength-1 && i < Col-1 && Buf[i] != '\n' && Buf[i] != '\r')
++i;
if (i < Col-1)
- return getLocForStartOfFile(FID).getLocWithOffset(FilePos + i);
+ return FileLoc.getLocWithOffset(FilePos + i);
- return getLocForStartOfFile(FID).getLocWithOffset(FilePos + Col - 1);
+ return FileLoc.getLocWithOffset(FilePos + Col - 1);
}
/// \brief Compute a map of macro argument chunks to their expanded source