[Bug preprocessor/69664] [6 Regression] column info is lost

["dmalcolm at gcc dot gnu.org" <gcc-bugzilla at gcc dot gnu dot org>]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69664

--- Comment #5 from David Malcolm <dmalcolm at gcc dot gnu.org> ---
Author: dmalcolm
Date: Mon Feb  8 17:33:45 2016
New Revision: 233223

URL: https://gcc.gnu.org/viewcvs?rev=233223&root=gcc&view=rev
Log:
PR preprocessor/69664: fix rich_location::override_column

gcc/testsuite/ChangeLog:
        PR preprocessor/69664
        * gcc.dg/cpp/trad/comment-2.c: Add expected column number.
        * gcc.dg/cpp/warn-comments.c: Likewise.

libcpp/ChangeLog:
        PR preprocessor/69664
        * errors.c (cpp_diagnostic_with_line): Only call
        rich_location::override_column if the column is non-zero.
        * line-map.c (rich_location::override_column): Update columns
        within m_ranges[0].  Add assertions to verify that doing so is
        sane.

Modified:
    trunk/gcc/testsuite/ChangeLog
    trunk/gcc/testsuite/gcc.dg/cpp/trad/comment-2.c
    trunk/gcc/testsuite/gcc.dg/cpp/warn-comments.c
    trunk/libcpp/ChangeLog
    trunk/libcpp/errors.c
    trunk/libcpp/line-map.c