[cfe-commits] r170281 - /cfe/trunk/lib/Basic/SourceManager.cpp

[Nico Weber]

test?

On Sat, Dec 15, 2012 at 9:58 PM, Craig Topper <craig.topper at gmail.com>wrote:

> Author: ctopper
> Date: Sat Dec 15 23:58:32 2012
> New Revision: 170281
>
> URL: http://llvm.org/viewvc/llvm-project?rev=170281&view=rev
> Log:
> Don't use SourceLineCache in getColumnNumber if LastLineNoResult is past
> the end of the cache. Fixes PR14570.
>
> Modified:
>     cfe/trunk/lib/Basic/SourceManager.cpp
>
> Modified: cfe/trunk/lib/Basic/SourceManager.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/SourceManager.cpp?rev=170281&r1=170280&r2=170281&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Basic/SourceManager.cpp (original)
> +++ cfe/trunk/lib/Basic/SourceManager.cpp Sat Dec 15 23:58:32 2012
> @@ -1032,7 +1032,8 @@
>    // 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];
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20121216/5a04c2cc/attachment.html>