[PATCH] Simplified SourceManager::translateLineCol a bit.

[Alexander Kornienko]

Could anyone review this?


On Thu, Jul 18, 2013 at 4:17 PM, Alexander Kornienko <alexfh at google.com>wrote:

> Hi rsmith,
>
> http://llvm-reviews.chandlerc.com/D1183
>
> Files:
>   lib/Basic/SourceManager.cpp
>
> Index: lib/Basic/SourceManager.cpp
> ===================================================================
> --- lib/Basic/SourceManager.cpp
> +++ lib/Basic/SourceManager.cpp
> @@ -1732,7 +1732,7 @@
>    const SLocEntry &Entry = getSLocEntry(FID, &Invalid);
>    if (Invalid)
>      return SourceLocation();
> -
> +
>    if (!Entry.isFile())
>      return SourceLocation();
>
> @@ -1745,7 +1745,7 @@
>      = const_cast<ContentCache *>(Entry.getFile().getContentCache());
>    if (!Content)
>      return SourceLocation();
> -
> +
>    // If this is the first use of line information for this buffer,
> compute the
>    // SourceLineCache for it on demand.
>    if (Content->SourceLineCache == 0) {
> @@ -1774,10 +1774,7 @@
>    // 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 FileLoc.getLocWithOffset(FilePos + i);
> -
> -  return FileLoc.getLocWithOffset(FilePos + Col - 1);
> +  return FileLoc.getLocWithOffset(FilePos + i);
>  }
>
>  /// \brief Compute a map of macro argument chunks to their expanded source
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130729/bcf07f12/attachment.html>