diff options
| author | Craig Topper <craig.topper@gmail.com> | 2012-12-16 05:58:32 +0000 |
|---|---|---|
| committer | Craig Topper <craig.topper@gmail.com> | 2012-12-16 05:58:32 +0000 |
| commit | f3b839b063896ea6f058c0bb6b10f18949e524ce (patch) | |
| tree | b48fc64e6c5097d9b666fd6d53b3c56b537f7114 /clang/lib/Basic/SourceManager.cpp | |
| parent | c7146e251dde04bf7749571448ca014604db023e (diff) | |
| download | bcm5719-llvm-f3b839b063896ea6f058c0bb6b10f18949e524ce.tar.gz bcm5719-llvm-f3b839b063896ea6f058c0bb6b10f18949e524ce.zip | |
Don't use SourceLineCache in getColumnNumber if LastLineNoResult is past the end of the cache. Fixes PR14570.
llvm-svn: 170281
Diffstat (limited to 'clang/lib/Basic/SourceManager.cpp')
| -rw-r--r-- | clang/lib/Basic/SourceManager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index 0c008659df6..f1965e7ebda 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -1032,7 +1032,8 @@ unsigned SourceManager::getColumnNumber(FileID FID, unsigned FilePos, // See if we just calculated the line number for this FilePos and can use // that to lookup the start of the line instead of searching for it. if (LastLineNoFileIDQuery == FID && - LastLineNoContentCache->SourceLineCache != 0) { + LastLineNoContentCache->SourceLineCache != 0 && + LastLineNoResult < LastLineNoContentCache->NumLines) { unsigned *SourceLineCache = LastLineNoContentCache->SourceLineCache; unsigned LineStart = SourceLineCache[LastLineNoResult - 1]; unsigned LineEnd = SourceLineCache[LastLineNoResult]; |
